Update to probert tip
The minimum required: it still only looks at the "blockdev" key in the probe data, none of the exciting new stuff.
This commit is contained in:
parent
4794a68306
commit
ec15929d60
|
@ -1,5 +1,6 @@
|
|||
{
|
||||
"storage": {
|
||||
"blockdev": {
|
||||
"/dev/sdh1": {
|
||||
"ID_ATA_WRITE_CACHE_ENABLED": "1",
|
||||
"ID_SERIAL_SHORT": "S1KHNYAG105196",
|
||||
|
@ -537,6 +538,7 @@
|
|||
"ID_FS_UUID": "febb4cb9-95bc-4973-9163-d50d5f1a320c",
|
||||
"ID_FS_USAGE": "filesystem"
|
||||
}
|
||||
}
|
||||
},
|
||||
"network": {
|
||||
"links": [
|
||||
|
@ -828,7 +830,7 @@
|
|||
"name_assign_type": "3",
|
||||
"tx_queue_len": "1000",
|
||||
"phys_switch_id": null,
|
||||
"brforward": "\ufffd\ufffd\u0010S\ufffd\ufffd\u0001\u0001",
|
||||
"brforward": "<EFBFBD><EFBFBD>\u0010S<30><53>\u0001\u0001",
|
||||
"flags": "0x1003",
|
||||
"type": "1",
|
||||
"phys_port_id": null,
|
||||
|
|
|
@ -11,4 +11,4 @@ jsonschema
|
|||
pyudev
|
||||
requests
|
||||
requests-unixsocket
|
||||
-e git+https://github.com/CanonicalLtd/probert@670c7258014eef13a971be0bf12206d96f2829f3#egg=probert
|
||||
-e git+https://github.com/CanonicalLtd/probert@31e973d130a137ef1713ac23a422af0e32108c01#egg=probert
|
||||
|
|
|
@ -98,5 +98,5 @@ parts:
|
|||
stage-packages: [libc6, libnl-3-dev, libnl-genl-3-dev, libnl-route-3-dev]
|
||||
source: https://github.com/CanonicalLtd/probert.git
|
||||
source-type: git
|
||||
source-commit: d4276ab044f4cc8311fb66a9050f6674726cbbf2
|
||||
source-commit: 31e973d130a137ef1713ac23a422af0e32108c01
|
||||
requirements: requirements.txt
|
||||
|
|
|
@ -913,7 +913,7 @@ class FilesystemModel(object):
|
|||
return mounted_disks
|
||||
|
||||
def probe(self):
|
||||
storage = self.prober.get_storage()
|
||||
storage = self.prober.get_storage()["blockdev"]
|
||||
currently_mounted = self._get_system_mounted_disks()
|
||||
for path, data in storage.items():
|
||||
log.debug("fs probe %s", path)
|
||||
|
|
|
@ -74,4 +74,5 @@ class Prober():
|
|||
|
||||
def get_storage_info(self, device):
|
||||
''' Load a StorageInfo class for specified device '''
|
||||
return StorageInfo({device: self.get_storage().get(device)})
|
||||
return StorageInfo(
|
||||
{device: self.get_storage()['blockdev'].get(device)})
|
||||
|
|
Loading…
Reference in New Issue