[QUEUED scylladb next] test.py: delete unimplemented remove server

0 views
Skip to first unread message

Commit Bot

<bot@cloudius-systems.com>
unread,
Oct 4, 2022, 5:51:25 AM10/4/22
to scylladb-dev@googlegroups.com, Alejo Sanchez
From: Alejo Sanchez <alejo....@scylladb.com>
Committer: Alejo Sanchez <alejo....@scylladb.com>
Branch: next

test.py: delete unimplemented remove server

Delete of Unused and unimplemented broken version of remove server.

Signed-off-by: Alejo Sanchez <alejo....@scylladb.com>

---
diff --git a/test/pylib/manager_client.py b/test/pylib/manager_client.py
--- a/test/pylib/manager_client.py
+++ b/test/pylib/manager_client.py
@@ -171,12 +171,6 @@ async def server_add(self) -> str:
logger.debug("ManagerClient added %s", server_id)
return server_id

- async def server_remove(self, server_id: str) -> None:
- """Remove a specified server"""
- logger.debug("ManagerClient removing %s", server_id)
- await self._get_text(f"/cluster/removeserver/{server_id}")
- self._driver_update()
-
async def server_get_config(self, server_id: str) -> dict[str, object]:
resp = await self._get(f"/cluster/server/{server_id}/get_config")
if resp.status != 200:
diff --git a/test/pylib/scylla_cluster.py b/test/pylib/scylla_cluster.py
--- a/test/pylib/scylla_cluster.py
+++ b/test/pylib/scylla_cluster.py
@@ -643,10 +643,6 @@ async def server_restart(self, server_id: str) -> ActionReturn:
return ret
return await self.server_start(server_id)

- async def server_remove(self, server_id: str) -> ActionReturn:
- """Remove a specified server"""
- raise NotImplementedError
-
def get_config(self, server_id: str) -> ActionReturn:
"""Get conf/scylla.yaml of the given server as a dictionary.
Fails if the server cannot be found."""
@@ -757,7 +753,6 @@ def _setup_routes(self) -> None:
self.app.router.add_get('/cluster/server/{id}/start', self._cluster_server_start)
self.app.router.add_get('/cluster/server/{id}/restart', self._cluster_server_restart)
self.app.router.add_get('/cluster/addserver', self._cluster_server_add)
- self.app.router.add_get('/cluster/removeserver/{id}', self._cluster_server_remove)
self.app.router.add_get('/cluster/server/{id}/get_config', self._server_get_config)
self.app.router.add_put('/cluster/server/{id}/update_config', self._server_update_config)

@@ -840,14 +835,6 @@ async def _cluster_server_add(self, _request) -> aiohttp.web.Response:
server_id = await self.cluster.add_server()
return aiohttp.web.Response(text=server_id)

- async def _cluster_server_remove(self, _request) -> aiohttp.web.Response:
- """Remove a specified server"""
- assert self.cluster
- server_id = _request.match_info['id']
- if not await self.cluster.server_remove(server_id):
- return aiohttp.web.Response(status=500, text=f"Host {server_id} not found")
- return aiohttp.web.Response(text="OK")
-
async def _server_get_config(self, request: aiohttp.web.Request) -> aiohttp.web.Response:
"""Get conf/scylla.yaml of the given server as a dictionary."""
assert self.cluster

Commit Bot

<bot@cloudius-systems.com>
unread,
Oct 4, 2022, 2:50:20 PM10/4/22
to scylladb-dev@googlegroups.com, Alejo Sanchez
From: Alejo Sanchez <alejo....@scylladb.com>
Committer: Alejo Sanchez <alejo....@scylladb.com>
Branch: master
Reply all
Reply to author
Forward
0 new messages