StealthOS/subiquity
StealthOS
/
subiquity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

filesystem: drop deprecated v2 guided 

The old guided method used in v2 is now wholly replaced by the new,
multiple target type, counterpart.
This commit is contained in:
Dan Bungert 2022-07-12 14:02:35 -06:00
parent aa59399d6c
commit c3f7f43e18
3 changed files with 17 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
subiquity/common/apidef.py
View File

@ -255,11 +255,6 @@ class API:
def GET() -> List[Disk]: ...
class v2:
class deprecated:
class guided:
def POST(data: Payload[GuidedChoice]) \
-> StorageResponseV2: ...
def GET() -> StorageResponseV2: ...
def POST() -> StorageResponseV2: ...

6
subiquity/server/controllers/filesystem.py
View File

@ -391,12 +391,6 @@ class FilesystemController(SubiquityController, FilesystemManipulator):
self.model.reset()
return await self.v2_GET()
async def v2_deprecated_guided_POST(self, data: GuidedChoice) \
-> StorageResponseV2:
log.debug(data)
self.guided(GuidedChoiceV2.from_guided_choice(data))
return await self.v2_GET()
async def v2_guided_GET(self) -> GuidedStorageResponseV2:
"""Acquire a list of possible guided storage configuration scenarios.
Results are sorted by the size of the space potentially available to

40
subiquity/tests/api/test_api.py
View File

@ -248,7 +248,7 @@ class TestBitlocker(TestAPI):
class TestFlow(TestAPI):
@timeout(2)
async def test_server_flow(self):
async def test_serverish_flow(self):
async with start_server('examples/simple.json') as inst:
await inst.post('/locale', 'en_US.UTF-8')
keyboard = {
@ -262,10 +262,10 @@ class TestFlow(TestAPI):
await inst.post('/network')
await inst.post('/proxy', '')
await inst.post('/mirror', 'http://us.archive.ubuntu.com/ubuntu')
resp = await inst.get('/storage/guided')
disk_id = resp['disks'][0]['id']
choice = {"disk_id": disk_id}
await inst.post('/storage/v2/deprecated/guided', choice)
resp = await inst.get('/storage/v2/guided')
[reformat] = resp['possible']
await inst.post('/storage/v2/guided', {'target': reformat})
await inst.post('/storage/v2')
await inst.get('/meta/status', cur='WAITING')
await inst.post('/meta/confirm', tty='/dev/tty1')
@ -348,23 +348,17 @@ class TestFlow(TestAPI):
reset_resp = await inst.post('/storage/v2/reset')
self.assertEqual(orig_resp, reset_resp)
choice = {'disk_id': disk_id}
guided_resp = await inst.post('/storage/v2/deprecated/guided',
choice)
resp = await inst.get('/storage/v2/guided')
[reformat] = match(resp['possible'],
_type='GuidedStorageTargetReformat')
await inst.post('/storage/v2/guided', {'target': reformat})
after_guided_resp = await inst.get('/storage/v2')
post_resp = await inst.post('/storage/v2')
# posting to the endpoint shouldn't change the answer
self.assertEqual(guided_resp, post_resp)
self.assertEqual(after_guided_resp, post_resp)
class TestGuided(TestAPI):
@timeout()
async def test_deprecated_guided_v2(self):
async with start_server('examples/simple.json') as inst:
choice = {'disk_id': 'disk-sda'}
resp = await inst.post('/storage/v2/deprecated/guided', choice)
self.assertEqual(1, len(resp['disks']))
self.assertEqual('disk-sda', resp['disks'][0]['id'])
@timeout()
async def test_guided_v2_reformat(self):
cfg = 'examples/win10-along-ubuntu.json'
@ -373,8 +367,7 @@ class TestGuided(TestAPI):
resp = await inst.get('/storage/v2/guided')
[reformat] = match(resp['possible'],
_type='GuidedStorageTargetReformat')
data = {'target': reformat}
resp = await inst.post('/storage/v2/guided', data)
resp = await inst.post('/storage/v2/guided', {'target': reformat})
self.assertEqual(reformat, resp['configured']['target'])
resp = await inst.get('/storage/v2')
[p1, p2] = resp['disks'][0]['partitions']
@ -912,14 +905,15 @@ class TestTodos(TestAPI): # server indicators of required client actions
@timeout()
async def test_todos_guided(self):
async with start_server('examples/simple.json') as inst:
disk_id = 'disk-sda'
resp = await inst.post('/storage/v2/reformat_disk',
{'disk_id': disk_id})
{'disk_id': 'disk-sda'})
self.assertTrue(resp['need_root'])
self.assertTrue(resp['need_boot'])
choice = {'disk_id': disk_id}
resp = await inst.post('/storage/v2/deprecated/guided', choice)
resp = await inst.get('/storage/v2/guided')
[reformat] = resp['possible']
await inst.post('/storage/v2/guided', {'target': reformat})
resp = await inst.get('/storage/v2')
self.assertFalse(resp['need_root'])
self.assertFalse(resp['need_boot'])