diff --git a/vrtManager/network.py b/vrtManager/network.py index 16aaccb..ee93d91 100644 --- a/vrtManager/network.py +++ b/vrtManager/network.py @@ -46,6 +46,7 @@ class wvmNetworks(wvmConnect): "device": net_bridge, "forward": net_forward }) + return networks def define_network(self, xml): diff --git a/vrtManager/storage.py b/vrtManager/storage.py index 7c88886..64f303d 100644 --- a/vrtManager/storage.py +++ b/vrtManager/storage.py @@ -227,11 +227,18 @@ class wvmStorage(wvmConnect): return self.pool.refresh(0) def get_volume_details(self, volname): - try: + with contextlib.suppress(Exception): self.refresh() - except Exception: - pass + vols = self.get_volumes() + return [{"name": volname, + "size": self.get_volume_size(volname), + "allocation": self.get_volume_allocation(volname), + "type": self.get_volume_format_type(volname)} for volname in vols] + + def get_volume_details(self, volname): + with contextlib.suppress(Exception): + self.refresh() return { "name": volname, "size": self.get_volume_size(volname), @@ -239,7 +246,6 @@ class wvmStorage(wvmConnect): "type": self.get_volume_format_type(volname), } - def update_volumes(self): with contextlib.suppress(Exception): self.refresh() @@ -248,7 +254,6 @@ class wvmStorage(wvmConnect): "allocation": self.get_volume_allocation(volname), "type": self.get_volume_format_type(volname)} for volname in vols] - def create_volume(self, name, size, vol_fmt="qcow2", metadata=False, disk_owner_uid=0, disk_owner_gid=0): size = int(size) * 1073741824 storage_type = self.get_type()