Skip to content

Commit 312cb8b

Browse files
committed
fix: Fix isActive -> enabled for virtual servers
Branch: PyPIPush Signed-off-by: Gabe Goodhart <ghart@us.ibm.com>
1 parent 414719d commit 312cb8b

2 files changed

Lines changed: 11 additions & 12 deletions

File tree

cforge/commands/resources/virtual_servers.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,7 @@ def virtual_servers_list(
5858
print_table(
5959
servers,
6060
"Virtual Servers",
61-
["id", "name", "description", "isActive"],
62-
{"isActive": "enabled"},
61+
["id", "name", "description", "enabled"],
6362
)
6463
else:
6564
console.print("[yellow]No virtual servers found[/yellow]")
@@ -178,7 +177,7 @@ def virtual_servers_toggle(
178177
try:
179178
current_status = make_authenticated_request("GET", f"/servers/{server_id}")
180179
assert isinstance(current_status, dict)
181-
if current_status["isActive"]:
180+
if current_status["enabled"]:
182181
activate = False
183182
else:
184183
activate = True

tests/commands/resources/test_virtual_servers.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ def test_virtual_servers_list_error(self, mock_console) -> None:
7575

7676
def test_virtual_servers_list_with_active_only_true(self, mock_console) -> None:
7777
"""Test virtual-servers list with --active-only flag set to True."""
78-
mock_servers = [{"id": "vs-1234", "name": "server1", "isActive": True}]
78+
mock_servers = [{"id": "vs-1234", "name": "server1", "enabled": True}]
7979

8080
with patch("cforge.commands.resources.virtual_servers.get_console", return_value=mock_console):
8181
with patch("cforge.commands.resources.virtual_servers.make_authenticated_request", return_value=mock_servers) as mock_req:
@@ -88,7 +88,7 @@ def test_virtual_servers_list_with_active_only_true(self, mock_console) -> None:
8888

8989
def test_virtual_servers_list_with_active_only_false(self, mock_console) -> None:
9090
"""Test virtual-servers list with --active-only flag set to False (default)."""
91-
mock_servers = [{"id": "vs-1234", "name": "server1", "isActive": True}, {"id": "vs-5678", "name": "server2", "isActive": False}]
91+
mock_servers = [{"id": "vs-1234", "name": "server1", "enabled": True}, {"id": "vs-5678", "name": "server2", "enabled": False}]
9292

9393
with patch("cforge.commands.resources.virtual_servers.get_console", return_value=mock_console):
9494
with patch("cforge.commands.resources.virtual_servers.make_authenticated_request", return_value=mock_servers) as mock_req:
@@ -101,7 +101,7 @@ def test_virtual_servers_list_with_active_only_false(self, mock_console) -> None
101101

102102
def test_virtual_servers_list_default_shows_all(self, mock_console) -> None:
103103
"""Test virtual-servers list default behavior shows all servers."""
104-
mock_servers = [{"id": "vs-1234", "name": "server1", "isActive": True}, {"id": "vs-5678", "name": "server2", "isActive": False}]
104+
mock_servers = [{"id": "vs-1234", "name": "server1", "enabled": True}, {"id": "vs-5678", "name": "server2", "enabled": False}]
105105

106106
with patch("cforge.commands.resources.virtual_servers.get_console", return_value=mock_console):
107107
with patch("cforge.commands.resources.virtual_servers.make_authenticated_request", return_value=mock_servers) as mock_req:
@@ -216,7 +216,7 @@ def test_virtual_servers_toggle_from_inactive_to_active(self, mock_console) -> N
216216
with patch("cforge.commands.resources.virtual_servers.get_console", return_value=mock_console):
217217
with patch("cforge.commands.resources.virtual_servers.make_authenticated_request") as mock_req:
218218
# First call (GET) returns inactive server, second call (POST) returns active server
219-
mock_req.side_effect = [{"id": "vs-123", "name": "test", "isActive": False}, {"id": "vs-123", "name": "test", "isActive": True}] # GET current status # POST toggle result
219+
mock_req.side_effect = [{"id": "vs-123", "name": "test", "enabled": False}, {"id": "vs-123", "name": "test", "enabled": True}] # GET current status # POST toggle result
220220
with patch("cforge.commands.resources.virtual_servers.print_json"):
221221
virtual_servers_toggle(server_id="vs-123")
222222

@@ -239,7 +239,7 @@ def test_virtual_servers_toggle_from_active_to_inactive(self, mock_console) -> N
239239
with patch("cforge.commands.resources.virtual_servers.get_console", return_value=mock_console):
240240
with patch("cforge.commands.resources.virtual_servers.make_authenticated_request") as mock_req:
241241
# First call (GET) returns active server, second call (POST) returns inactive server
242-
mock_req.side_effect = [{"id": "vs-123", "name": "test", "isActive": True}, {"id": "vs-123", "name": "test", "isActive": False}] # GET current status # POST toggle result
242+
mock_req.side_effect = [{"id": "vs-123", "name": "test", "enabled": True}, {"id": "vs-123", "name": "test", "enabled": False}] # GET current status # POST toggle result
243243
with patch("cforge.commands.resources.virtual_servers.print_json"):
244244
virtual_servers_toggle(server_id="vs-123")
245245

@@ -262,7 +262,7 @@ def test_virtual_servers_toggle_detects_current_status(self, mock_console) -> No
262262
with patch("cforge.commands.resources.virtual_servers.get_console", return_value=mock_console):
263263
with patch("cforge.commands.resources.virtual_servers.make_authenticated_request") as mock_req:
264264
# Mock a server that is currently active
265-
mock_req.side_effect = [{"id": "vs-123", "name": "test", "isActive": True}, {"id": "vs-123", "name": "test", "isActive": False}]
265+
mock_req.side_effect = [{"id": "vs-123", "name": "test", "enabled": True}, {"id": "vs-123", "name": "test", "enabled": False}]
266266
with patch("cforge.commands.resources.virtual_servers.print_json"):
267267
virtual_servers_toggle(server_id="vs-123")
268268

@@ -576,7 +576,7 @@ def test_virtual_servers_toggle_status_detection_integration(self, mock_console,
576576
):
577577
virtual_servers_create(data_file=None, name=None, description=None)
578578
virtual_server_id = mocks.print_json.call_args[0][0]["id"]
579-
initial_status = mocks.print_json.call_args[0][0]["isActive"]
579+
initial_status = mocks.print_json.call_args[0][0]["enabled"]
580580
assert initial_status is True, "New virtual server should start active"
581581
mocks.print_json.reset_mock()
582582

@@ -586,7 +586,7 @@ def test_virtual_servers_toggle_status_detection_integration(self, mock_console,
586586

587587
# Verify status changed by getting it
588588
virtual_servers_get(virtual_server_id)
589-
current_status = mocks.print_json.call_args[0][0]["isActive"]
589+
current_status = mocks.print_json.call_args[0][0]["enabled"]
590590
assert current_status is False, "Virtual server should now be inactive"
591591
mocks.print_json.reset_mock()
592592

@@ -596,7 +596,7 @@ def test_virtual_servers_toggle_status_detection_integration(self, mock_console,
596596

597597
# Verify status changed back
598598
virtual_servers_get(virtual_server_id)
599-
final_status = mocks.print_json.call_args[0][0]["isActive"]
599+
final_status = mocks.print_json.call_args[0][0]["enabled"]
600600
assert final_status is True, "Virtual server should be active again"
601601

602602
# Clean up

0 commit comments

Comments
 (0)