trustchain-oc1-orchestral/devicehub-teal
Archived
10
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #395 from eReuse/changes/3943-wb-response

Browse source 
change response
This commit is contained in:
cayop 2022-10-28 16:41:24 +02:00 committed by GitHub
parent 2252fe93cd 04a3ec99de
commit 3a7a8d6e1d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ereuse_devicehub/api/views.py
View file

@ -72,11 +72,13 @@ class InventoryView(LoginMixin, SnapshotMixin):
db.session().final_flush() db.session().final_flush()
db.session.commit() db.session.commit()
url = "https://{}/".format(app.config['HOST'])
public_url = "{}{}".format(url.strip("/"), snapshot.device.url.to_text())
self.response = jsonify( self.response = jsonify(
{ {
'url': snapshot.device.url.to_text(),
'dhid': snapshot.device.dhid, 'dhid': snapshot.device.dhid,
'sid': snapshot.sid, 'url': url,
'public_url': public_url,
} }
) )
self.response.status_code = 201 self.response.status_code = 201

9
tests/test_snapshot.py
View file

@ -1001,7 +1001,7 @@ def test_snapshot_wb_lite(user: UserClient):
ssd = [x for x in dev.components if x.type == 'SolidStateDrive'][0] ssd = [x for x in dev.components if x.type == 'SolidStateDrive'][0]
assert dev.manufacturer == 'lenovo' assert dev.manufacturer == 'lenovo'
assert body['sid'] == "MLKO1Y0R55XZM051WQ5KJM01RY44Q" assert dev.dhid in body['public_url']
assert ssd.serial_number == 's35anx0j401001' assert ssd.serial_number == 's35anx0j401001'
assert res.status == '201 CREATED' assert res.status == '201 CREATED'
assert '00:28:f8:a6:d5:7e' in dev.hid assert '00:28:f8:a6:d5:7e' in dev.hid
@ -1020,11 +1020,11 @@ def test_snapshot_wb_lite_qemu(user: UserClient):
snapshot = file_json("qemu-cc9927a9-55ad-4937-b36b-7185147d9fa9.json") snapshot = file_json("qemu-cc9927a9-55ad-4937-b36b-7185147d9fa9.json")
body, res = user.post(snapshot, uri="/api/inventory/") body, res = user.post(snapshot, uri="/api/inventory/")
assert body['sid'] == "VL0L5"
assert res.status == '201 CREATED' assert res.status == '201 CREATED'
dev = m.Device.query.filter_by(devicehub_id=body['dhid']).one() dev = m.Device.query.filter_by(devicehub_id=body['dhid']).one()
dev = dev.placeholder.binding dev = dev.placeholder.binding
assert dev.dhid in body['public_url']
assert dev.manufacturer == 'qemu' assert dev.manufacturer == 'qemu'
assert dev.model == 'standard' assert dev.model == 'standard'
assert dev.serial_number is None assert dev.serial_number is None
@ -1170,7 +1170,8 @@ def test_snapshot_lite_minimum(user: UserClient):
}, },
} }
bodyLite, res = user.post(snapshot_lite, uri="/api/inventory/") bodyLite, res = user.post(snapshot_lite, uri="/api/inventory/")
assert bodyLite['sid'] == 'MLKO1' dev = m.Device.query.filter_by(devicehub_id=bodyLite['dhid']).one()
assert dev.dhid in bodyLite['public_url']
assert res.status_code == 201 assert res.status_code == 201
@ -1197,10 +1198,10 @@ def test_snapshot_lite_error_in_components(user: UserClient):
}, },
} }
bodyLite, res = user.post(snapshot_lite, uri="/api/inventory/") bodyLite, res = user.post(snapshot_lite, uri="/api/inventory/")
assert bodyLite['sid'] == 'MLKO1'
assert res.status_code == 201 assert res.status_code == 201
dev = m.Device.query.filter_by(devicehub_id=bodyLite['dhid']).one() dev = m.Device.query.filter_by(devicehub_id=bodyLite['dhid']).one()
assert dev.dhid in bodyLite['public_url']
assert 'Motherboard' not in [x.type for x in dev.components] assert 'Motherboard' not in [x.type for x in dev.components]
error = SnapshotsLog.query.all() error = SnapshotsLog.query.all()
assert 'StopIteration' in error[0].description assert 'StopIteration' in error[0].description