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:
Michael Hudson-Doyle 2019-04-02 11:30:58 +13:00
parent 4794a68306
commit ec15929d60
5 changed files with 1650 additions and 1647 deletions

File diff suppressed because it is too large Load Diff

View File

@ -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

View File

@ -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

View File

@ -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)

View File

@ -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)})