Merge pull request #266 from CanonicalLtd/mwhudson/probert-reorg

changes following changes in probert
This commit is contained in:
Michael Hudson-Doyle 2017-11-16 10:53:55 +13:00 committed by GitHub
commit b602f9316b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 1462 additions and 6431 deletions

View File

@ -1,655 +0,0 @@
{
"network": {
"eth0": {
"bond": {
"is_master": false,
"is_slave": false,
"mode": null,
"slaves": null
},
"bridge": {
"interfaces": [],
"is_bridge": false,
"is_port": false,
"options": {}
},
"hardware": {
"DEVPATH": "/devices/pci0000:00/0000:00:02.0/virtio0/net/eth0",
"ID_BUS": "pci",
"ID_MODEL_FROM_DATABASE": "Virtio network device",
"ID_MODEL_ID": "0x1000",
"ID_NET_NAME_MAC": "enxfa163ef69417",
"ID_PCI_CLASS_FROM_DATABASE": "Network controller",
"ID_PCI_SUBCLASS_FROM_DATABASE": "Ethernet controller",
"ID_VENDOR_FROM_DATABASE": "Red Hat, Inc",
"ID_VENDOR_ID": "0x1af4",
"IFINDEX": "2",
"INTERFACE": "eth0",
"MATCHDEVID": "0x0",
"MATCHIFTYPE": "1",
"SUBSYSTEM": "net",
"USEC_INITIALIZED": "59749",
"attrs": {
"addr_assign_type": "0",
"addr_len": "6",
"address": "fa:16:3e:f6:94:17",
"broadcast": "ff:ff:ff:ff:ff:ff",
"carrier": "1",
"carrier_changes": "2",
"dev_id": "0x0",
"dev_port": "0",
"device": null,
"dormant": "0",
"duplex": null,
"flags": "0x1003",
"gro_flush_timeout": "0",
"ifalias": "",
"ifindex": "2",
"iflink": "2",
"link_mode": "0",
"mtu": "1500",
"name_assign_type": null,
"netdev_group": "0",
"operstate": "up",
"phys_port_id": null,
"phys_switch_id": null,
"speed": null,
"subsystem": "net",
"tx_queue_len": "1000",
"type": "1",
"uevent": "INTERFACE=eth0\nIFINDEX=2"
}
},
"ip": {
"addr": "10.5.1.213",
"broadcast": "10.5.255.255",
"netmask": "255.255.0.0",
"source": {
"config": {
"active": true,
"lease": {
"expire": "5 2015/10/30 14:15:17",
"fixed-address": "10.5.1.213",
"interface": "eth0",
"options": {
"broadcast-address": "10.5.255.255",
"dhcp-lease-time": "86400",
"dhcp-message-type": "5",
"dhcp-rebinding-time": "75600",
"dhcp-renewal-time": "43200",
"dhcp-server-identifier": "10.5.0.3",
"domain-name": "openstacklocal",
"domain-name-servers": "10.5.0.2",
"host-name": "host-10-5-1-213",
"routers": "10.5.0.1",
"subnet-mask": "255.255.0.0"
},
"rebind": "5 2015/10/30 11:15:17",
"renew": "5 2015/10/30 00:05:25"
}
},
"method": "dhcp",
"provider": "10.5.0.3"
}
},
"type": "eth"
},
"lo": {
"bond": {
"is_master": false,
"is_slave": false,
"mode": null,
"slaves": null
},
"bridge": {
"interfaces": [],
"is_bridge": false,
"is_port": false,
"options": {}
},
"hardware": {
"DEVPATH": "/devices/virtual/net/lo",
"IFINDEX": "1",
"INTERFACE": "lo",
"SUBSYSTEM": "net",
"attrs": {
"addr_assign_type": "0",
"addr_len": "6",
"address": "00:00:00:00:00:00",
"broadcast": "00:00:00:00:00:00",
"carrier": "1",
"carrier_changes": "0",
"dev_id": "0x0",
"dev_port": "0",
"dormant": "0",
"duplex": null,
"flags": "0x9",
"gro_flush_timeout": "0",
"ifalias": "",
"ifindex": "1",
"iflink": "1",
"link_mode": "0",
"mtu": "65536",
"name_assign_type": null,
"netdev_group": "0",
"operstate": "unknown",
"phys_port_id": null,
"phys_switch_id": null,
"speed": null,
"subsystem": "net",
"tx_queue_len": "0",
"type": "772",
"uevent": "INTERFACE=lo\nIFINDEX=1"
}
},
"ip": {
"addr": "127.0.0.1",
"netmask": "255.0.0.0",
"peer": "127.0.0.1",
"source": {
"config": {
"auto": true,
"family": "inet",
"method": "loopback"
},
"method": "loopback",
"provider": "local config"
}
},
"type": "lo"
}
},
"storage": {
"/dev/vda": {
"DEVNAME": "/dev/vda",
"DEVPATH": "/devices/pci0000:00/0000:00:03.0/virtio1/block/vda",
"DEVTYPE": "disk",
"ID_PART_TABLE_TYPE": "dos",
"MAJOR": "253",
"MINOR": "0",
"SUBSYSTEM": "block",
"USEC_INITIALIZED": "27584",
"attrs": {
"alignment_offset": "0",
"bdi": null,
"cache_type": "write back",
"capability": "10",
"dev": "253:0",
"device": null,
"discard_alignment": "0",
"ext_range": "16",
"inflight": " 0 0",
"range": "16",
"removable": "0",
"ro": "0",
"serial": "",
"size": "42949672960",
"stat": " 16465 0 476570 40152 12398 1622 1384296 289584 0 31396 329716",
"subsystem": "block",
"uevent": "MAJOR=253\nMINOR=0\nDEVNAME=vda\nDEVTYPE=disk"
}
},
"/dev/vda1": {
"DEVLINKS": "/dev/disk/by-label/cloudimg-rootfs /dev/disk/by-uuid/0a54040e-ccf2-462d-a73a-cbabaf0095de",
"DEVNAME": "/dev/vda1",
"DEVPATH": "/devices/pci0000:00/0000:00:03.0/virtio1/block/vda/vda1",
"DEVTYPE": "partition",
"ID_FS_LABEL": "cloudimg-rootfs",
"ID_FS_LABEL_ENC": "cloudimg-rootfs",
"ID_FS_TYPE": "ext4",
"ID_FS_USAGE": "filesystem",
"ID_FS_UUID": "0a54040e-ccf2-462d-a73a-cbabaf0095de",
"ID_FS_UUID_ENC": "0a54040e-ccf2-462d-a73a-cbabaf0095de",
"ID_FS_VERSION": "1.0",
"ID_PART_ENTRY_DISK": "253:0",
"ID_PART_ENTRY_FLAGS": "0x80",
"ID_PART_ENTRY_NUMBER": "1",
"ID_PART_ENTRY_OFFSET": "2048",
"ID_PART_ENTRY_SCHEME": "dos",
"ID_PART_ENTRY_SIZE": "4192256",
"ID_PART_ENTRY_TYPE": "0x83",
"ID_PART_TABLE_TYPE": "dos",
"MAJOR": "253",
"MINOR": "1",
"SUBSYSTEM": "block",
"USEC_INITIALIZED": "27598",
"attrs": {
"alignment_offset": "0",
"dev": "253:1",
"discard_alignment": "0",
"inflight": " 0 0",
"partition": "1",
"ro": "0",
"size": "42948624384",
"start": "2048",
"stat": " 16285 0 475130 40092 12282 1622 1384288 289536 0 31300 329608",
"subsystem": "block",
"uevent": "MAJOR=253\nMINOR=1\nDEVNAME=vda1\nDEVTYPE=partition"
}
},
"/dev/vdb": {
"DEVLINKS": "/dev/disk/by-label/ephemeral0 /dev/disk/by-uuid/0553a37b-2f61-45fa-9ac5-31dbaedb0b44",
"DEVNAME": "/dev/vdb",
"DEVPATH": "/devices/pci0000:00/0000:00:04.0/virtio2/block/vdb",
"DEVTYPE": "disk",
"ID_FS_LABEL": "ephemeral0",
"ID_FS_LABEL_ENC": "ephemeral0",
"ID_FS_TYPE": "ext4",
"ID_FS_USAGE": "filesystem",
"ID_FS_UUID": "0553a37b-2f61-45fa-9ac5-31dbaedb0b44",
"ID_FS_UUID_ENC": "0553a37b-2f61-45fa-9ac5-31dbaedb0b44",
"ID_FS_VERSION": "1.0",
"MAJOR": "253",
"MINOR": "16",
"SUBSYSTEM": "block",
"USEC_INITIALIZED": "27695",
"attrs": {
"alignment_offset": "0",
"bdi": null,
"cache_type": "write back",
"capability": "10",
"dev": "253:16",
"device": null,
"discard_alignment": "0",
"ext_range": "16",
"inflight": " 0 0",
"range": "16",
"removable": "0",
"ro": "0",
"serial": "",
"size": "42949672960",
"stat": " 379 0 3050 220 1 0 8 4 0 224 224",
"subsystem": "block",
"uevent": "MAJOR=253\nMINOR=16\nDEVNAME=vdb\nDEVTYPE=disk"
}
},
"/dev/vdc": {
"DEVLINKS": "/dev/disk/by-id/virtio-3101105c-41a8-4a91-8",
"DEVNAME": "/dev/vdc",
"DEVPATH": "/devices/pci0000:00/0000:00:05.0/virtio3/block/vdc",
"DEVTYPE": "disk",
"ID_PART_TABLE_TYPE": "gpt",
"ID_SERIAL": "3101105c-41a8-4a91-8",
"MAJOR": "253",
"MINOR": "32",
"SUBSYSTEM": "block",
"USEC_INITIALIZED": "27779",
"attrs": {
"alignment_offset": "0",
"bdi": null,
"cache_type": "write back",
"capability": "10",
"dev": "253:32",
"device": null,
"discard_alignment": "0",
"ext_range": "16",
"inflight": " 0 0",
"range": "16",
"removable": "0",
"ro": "0",
"serial": "3101105c-41a8-4a91-8",
"size": "10737418240",
"stat": " 2304 0 18304 1952 0 0 0 0 0 1808 1944",
"subsystem": "block",
"uevent": "MAJOR=253\nMINOR=32\nDEVNAME=vdc\nDEVTYPE=disk"
}
},
"/dev/vdc1": {
"DEVLINKS": "/dev/disk/by-id/virtio-3101105c-41a8-4a91-8-part1 /dev/disk/by-partuuid/f5957e26-a3a6-4abe-8300-711cf47d5150",
"DEVNAME": "/dev/vdc1",
"DEVPATH": "/devices/pci0000:00/0000:00:05.0/virtio3/block/vdc/vdc1",
"DEVTYPE": "partition",
"ID_PART_ENTRY_DISK": "253:32",
"ID_PART_ENTRY_NUMBER": "1",
"ID_PART_ENTRY_OFFSET": "2048",
"ID_PART_ENTRY_SCHEME": "gpt",
"ID_PART_ENTRY_SIZE": "2095105",
"ID_PART_ENTRY_TYPE": "21686148-6449-6e6f-744e-656564454649",
"ID_PART_ENTRY_UUID": "f5957e26-a3a6-4abe-8300-711cf47d5150",
"ID_PART_TABLE_TYPE": "gpt",
"ID_SERIAL": "3101105c-41a8-4a91-8",
"MAJOR": "253",
"MINOR": "33",
"SUBSYSTEM": "block",
"USEC_INITIALIZED": "27791",
"attrs": {
"alignment_offset": "0",
"dev": "253:33",
"discard_alignment": "0",
"inflight": " 0 0",
"partition": "1",
"ro": "0",
"size": "1072693760",
"start": "2048",
"stat": " 1867 0 14775 1488 0 0 0 0 0 1480 1480",
"subsystem": "block",
"uevent": "MAJOR=253\nMINOR=33\nDEVNAME=vdc1\nDEVTYPE=partition"
}
},
"/dev/vdc2": {
"DEVLINKS": "/dev/disk/by-id/virtio-3101105c-41a8-4a91-8-part2 /dev/disk/by-partuuid/5467a9ed-ec0d-47d5-9b17-524fdf95066f /dev/disk/by-uuid/0775201a-a23f-437a-9531-ae2c62eeb2df",
"DEVNAME": "/dev/vdc2",
"DEVPATH": "/devices/pci0000:00/0000:00:05.0/virtio3/block/vdc/vdc2",
"DEVTYPE": "partition",
"ID_FS_TYPE": "ext4",
"ID_FS_USAGE": "filesystem",
"ID_FS_UUID": "0775201a-a23f-437a-9531-ae2c62eeb2df",
"ID_FS_UUID_ENC": "0775201a-a23f-437a-9531-ae2c62eeb2df",
"ID_FS_VERSION": "1.0",
"ID_PART_ENTRY_DISK": "253:32",
"ID_PART_ENTRY_NUMBER": "2",
"ID_PART_ENTRY_OFFSET": "2099200",
"ID_PART_ENTRY_SCHEME": "gpt",
"ID_PART_ENTRY_SIZE": "18870275",
"ID_PART_ENTRY_TYPE": "0fc63daf-8483-4772-8e79-3d69d8477de4",
"ID_PART_ENTRY_UUID": "5467a9ed-ec0d-47d5-9b17-524fdf95066f",
"ID_PART_TABLE_TYPE": "gpt",
"ID_SERIAL": "3101105c-41a8-4a91-8",
"MAJOR": "253",
"MINOR": "34",
"SUBSYSTEM": "block",
"USEC_INITIALIZED": "27802",
"attrs": {
"alignment_offset": "0",
"dev": "253:34",
"discard_alignment": "0",
"inflight": " 0 0",
"partition": "2",
"ro": "0",
"size": "9661580800",
"start": "2099200",
"stat": " 247 0 1961 224 0 0 0 0 0 224 224",
"subsystem": "block",
"uevent": "MAJOR=253\nMINOR=34\nDEVNAME=vdc2\nDEVTYPE=partition"
}
},
"/dev/vdd": {
"DEVLINKS": "/dev/disk/by-id/virtio-42853bd8-2fa8-47a1-8",
"DEVNAME": "/dev/vdd",
"DEVPATH": "/devices/pci0000:00/0000:00:06.0/virtio4/block/vdd",
"DEVTYPE": "disk",
"ID_PART_TABLE_TYPE": "gpt",
"ID_SERIAL": "42853bd8-2fa8-47a1-8",
"MAJOR": "253",
"MINOR": "48",
"SUBSYSTEM": "block",
"USEC_INITIALIZED": "28562",
"attrs": {
"alignment_offset": "0",
"bdi": null,
"cache_type": "write back",
"capability": "10",
"dev": "253:48",
"device": null,
"discard_alignment": "0",
"ext_range": "16",
"inflight": " 0 0",
"range": "16",
"removable": "0",
"ro": "0",
"serial": "42853bd8-2fa8-47a1-8",
"size": "10737418240",
"stat": " 216 0 1776 276 0 0 0 0 0 276 276",
"subsystem": "block",
"uevent": "MAJOR=253\nMINOR=48\nDEVNAME=vdd\nDEVTYPE=disk"
}
},
"/dev/vdd1": {
"DEVLINKS": "/dev/disk/by-id/virtio-42853bd8-2fa8-47a1-8-part1 /dev/disk/by-partuuid/449d6c37-3043-45ea-b049-40f7fe3ec219",
"DEVNAME": "/dev/vdd1",
"DEVPATH": "/devices/pci0000:00/0000:00:06.0/virtio4/block/vdd/vdd1",
"DEVTYPE": "partition",
"ID_FS_LABEL": "0",
"ID_FS_LABEL_ENC": "0",
"ID_FS_TYPE": "linux_raid_member",
"ID_FS_USAGE": "raid",
"ID_FS_UUID": "f47bbd4a-a338-0454-59c1-0df36c3dd3ac",
"ID_FS_UUID_ENC": "f47bbd4a-a338-0454-59c1-0df36c3dd3ac",
"ID_FS_UUID_SUB": "3f54dd9f-619e-ce09-61bc-b55c2db63bdf",
"ID_FS_UUID_SUB_ENC": "3f54dd9f-619e-ce09-61bc-b55c2db63bdf",
"ID_FS_VERSION": "1.2",
"ID_PART_ENTRY_DISK": "253:48",
"ID_PART_ENTRY_NUMBER": "1",
"ID_PART_ENTRY_OFFSET": "2048",
"ID_PART_ENTRY_SCHEME": "gpt",
"ID_PART_ENTRY_SIZE": "20967425",
"ID_PART_ENTRY_TYPE": "a19d880f-05fc-4d3b-a006-743f0f84911e",
"ID_PART_ENTRY_UUID": "449d6c37-3043-45ea-b049-40f7fe3ec219",
"ID_PART_TABLE_TYPE": "gpt",
"ID_SERIAL": "42853bd8-2fa8-47a1-8",
"MAJOR": "253",
"MINOR": "49",
"SUBSYSTEM": "block",
"USEC_INITIALIZED": "28594",
"attrs": {
"alignment_offset": "0",
"dev": "253:49",
"discard_alignment": "0",
"inflight": " 0 0",
"partition": "1",
"ro": "0",
"size": "10735321600",
"start": "2048",
"stat": " 26 0 208 32 0 0 0 0 0 32 32",
"subsystem": "block",
"uevent": "MAJOR=253\nMINOR=49\nDEVNAME=vdd1\nDEVTYPE=partition"
}
},
"/dev/vde": {
"DEVLINKS": "/dev/disk/by-id/virtio-4425cd92-a556-4bca-9",
"DEVNAME": "/dev/vde",
"DEVPATH": "/devices/pci0000:00/0000:00:07.0/virtio5/block/vde",
"DEVTYPE": "disk",
"ID_PART_TABLE_TYPE": "gpt",
"ID_SERIAL": "4425cd92-a556-4bca-9",
"MAJOR": "253",
"MINOR": "64",
"SUBSYSTEM": "block",
"USEC_INITIALIZED": "28779",
"attrs": {
"alignment_offset": "0",
"bdi": null,
"cache_type": "write back",
"capability": "10",
"dev": "253:64",
"device": null,
"discard_alignment": "0",
"ext_range": "16",
"inflight": " 0 0",
"range": "16",
"removable": "0",
"ro": "0",
"serial": "4425cd92-a556-4bca-9",
"size": "10737418240",
"stat": " 216 0 1776 292 0 0 0 0 0 292 292",
"subsystem": "block",
"uevent": "MAJOR=253\nMINOR=64\nDEVNAME=vde\nDEVTYPE=disk"
}
},
"/dev/vde1": {
"DEVLINKS": "/dev/disk/by-id/virtio-4425cd92-a556-4bca-9-part1 /dev/disk/by-partuuid/dfa973f4-2047-4e8b-83b8-aa98a445916b",
"DEVNAME": "/dev/vde1",
"DEVPATH": "/devices/pci0000:00/0000:00:07.0/virtio5/block/vde/vde1",
"DEVTYPE": "partition",
"ID_FS_LABEL": "0",
"ID_FS_LABEL_ENC": "0",
"ID_FS_TYPE": "linux_raid_member",
"ID_FS_USAGE": "raid",
"ID_FS_UUID": "f47bbd4a-a338-0454-59c1-0df36c3dd3ac",
"ID_FS_UUID_ENC": "f47bbd4a-a338-0454-59c1-0df36c3dd3ac",
"ID_FS_UUID_SUB": "d1d76041-9588-e376-68f0-21081033841c",
"ID_FS_UUID_SUB_ENC": "d1d76041-9588-e376-68f0-21081033841c",
"ID_FS_VERSION": "1.2",
"ID_PART_ENTRY_DISK": "253:64",
"ID_PART_ENTRY_NUMBER": "1",
"ID_PART_ENTRY_OFFSET": "2048",
"ID_PART_ENTRY_SCHEME": "gpt",
"ID_PART_ENTRY_SIZE": "20967425",
"ID_PART_ENTRY_TYPE": "a19d880f-05fc-4d3b-a006-743f0f84911e",
"ID_PART_ENTRY_UUID": "dfa973f4-2047-4e8b-83b8-aa98a445916b",
"ID_PART_TABLE_TYPE": "gpt",
"ID_SERIAL": "4425cd92-a556-4bca-9",
"MAJOR": "253",
"MINOR": "65",
"SUBSYSTEM": "block",
"USEC_INITIALIZED": "28792",
"attrs": {
"alignment_offset": "0",
"dev": "253:65",
"discard_alignment": "0",
"inflight": " 0 0",
"partition": "1",
"ro": "0",
"size": "10735321600",
"start": "2048",
"stat": " 26 0 208 44 0 0 0 0 0 44 44",
"subsystem": "block",
"uevent": "MAJOR=253\nMINOR=65\nDEVNAME=vde1\nDEVTYPE=partition"
}
},
"/dev/vdf": {
"DEVLINKS": "/dev/disk/by-id/virtio-4bf3d157-a919-452c-b",
"DEVNAME": "/dev/vdf",
"DEVPATH": "/devices/pci0000:00/0000:00:08.0/virtio6/block/vdf",
"DEVTYPE": "disk",
"ID_PART_TABLE_TYPE": "gpt",
"ID_SERIAL": "4bf3d157-a919-452c-b",
"MAJOR": "253",
"MINOR": "80",
"SUBSYSTEM": "block",
"USEC_INITIALIZED": "29280",
"attrs": {
"alignment_offset": "0",
"bdi": null,
"cache_type": "write back",
"capability": "10",
"dev": "253:80",
"device": null,
"discard_alignment": "0",
"ext_range": "16",
"inflight": " 0 0",
"range": "16",
"removable": "0",
"ro": "0",
"serial": "4bf3d157-a919-452c-b",
"size": "10737418240",
"stat": " 216 0 1776 268 0 0 0 0 0 268 268",
"subsystem": "block",
"uevent": "MAJOR=253\nMINOR=80\nDEVNAME=vdf\nDEVTYPE=disk"
}
},
"/dev/vdf1": {
"DEVLINKS": "/dev/disk/by-id/virtio-4bf3d157-a919-452c-b-part1 /dev/disk/by-partuuid/344d977c-8a85-47fc-8468-d318007428c4",
"DEVNAME": "/dev/vdf1",
"DEVPATH": "/devices/pci0000:00/0000:00:08.0/virtio6/block/vdf/vdf1",
"DEVTYPE": "partition",
"ID_FS_LABEL": "1",
"ID_FS_LABEL_ENC": "1",
"ID_FS_TYPE": "linux_raid_member",
"ID_FS_USAGE": "raid",
"ID_FS_UUID": "9344fd51-f4c3-de6a-9af7-3504f55d39fb",
"ID_FS_UUID_ENC": "9344fd51-f4c3-de6a-9af7-3504f55d39fb",
"ID_FS_UUID_SUB": "d04a14b4-a506-cdad-67cf-a7cf6efdfa85",
"ID_FS_UUID_SUB_ENC": "d04a14b4-a506-cdad-67cf-a7cf6efdfa85",
"ID_FS_VERSION": "1.2",
"ID_PART_ENTRY_DISK": "253:80",
"ID_PART_ENTRY_NUMBER": "1",
"ID_PART_ENTRY_OFFSET": "2048",
"ID_PART_ENTRY_SCHEME": "gpt",
"ID_PART_ENTRY_SIZE": "20967425",
"ID_PART_ENTRY_TYPE": "a19d880f-05fc-4d3b-a006-743f0f84911e",
"ID_PART_ENTRY_UUID": "344d977c-8a85-47fc-8468-d318007428c4",
"ID_PART_TABLE_TYPE": "gpt",
"ID_SERIAL": "4bf3d157-a919-452c-b",
"MAJOR": "253",
"MINOR": "81",
"SUBSYSTEM": "block",
"USEC_INITIALIZED": "29484",
"attrs": {
"alignment_offset": "0",
"dev": "253:81",
"discard_alignment": "0",
"inflight": " 0 0",
"partition": "1",
"ro": "0",
"size": "10735321600",
"start": "2048",
"stat": " 26 0 208 24 0 0 0 0 0 24 24",
"subsystem": "block",
"uevent": "MAJOR=253\nMINOR=81\nDEVNAME=vdf1\nDEVTYPE=partition"
}
},
"/dev/vdg": {
"DEVLINKS": "/dev/disk/by-id/virtio-64bddb21-61f3-4869-8",
"DEVNAME": "/dev/vdg",
"DEVPATH": "/devices/pci0000:00/0000:00:09.0/virtio7/block/vdg",
"DEVTYPE": "disk",
"ID_PART_TABLE_TYPE": "gpt",
"ID_SERIAL": "64bddb21-61f3-4869-8",
"MAJOR": "253",
"MINOR": "96",
"SUBSYSTEM": "block",
"USEC_INITIALIZED": "29847",
"attrs": {
"alignment_offset": "0",
"bdi": null,
"cache_type": "write back",
"capability": "10",
"dev": "253:96",
"device": null,
"discard_alignment": "0",
"ext_range": "16",
"inflight": " 0 0",
"range": "16",
"removable": "0",
"ro": "0",
"serial": "64bddb21-61f3-4869-8",
"size": "10737418240",
"stat": " 216 0 1776 248 0 0 0 0 0 248 248",
"subsystem": "block",
"uevent": "MAJOR=253\nMINOR=96\nDEVNAME=vdg\nDEVTYPE=disk"
}
},
"/dev/vdg1": {
"DEVLINKS": "/dev/disk/by-id/virtio-64bddb21-61f3-4869-8-part1 /dev/disk/by-partuuid/8f81c7b5-c229-4298-96b3-abdf242d4017",
"DEVNAME": "/dev/vdg1",
"DEVPATH": "/devices/pci0000:00/0000:00:09.0/virtio7/block/vdg/vdg1",
"DEVTYPE": "partition",
"ID_FS_LABEL": "1",
"ID_FS_LABEL_ENC": "1",
"ID_FS_TYPE": "linux_raid_member",
"ID_FS_USAGE": "raid",
"ID_FS_UUID": "9344fd51-f4c3-de6a-9af7-3504f55d39fb",
"ID_FS_UUID_ENC": "9344fd51-f4c3-de6a-9af7-3504f55d39fb",
"ID_FS_UUID_SUB": "3c5f7b40-8c8e-1510-4905-c0d1e4eb5e27",
"ID_FS_UUID_SUB_ENC": "3c5f7b40-8c8e-1510-4905-c0d1e4eb5e27",
"ID_FS_VERSION": "1.2",
"ID_PART_ENTRY_DISK": "253:96",
"ID_PART_ENTRY_NUMBER": "1",
"ID_PART_ENTRY_OFFSET": "2048",
"ID_PART_ENTRY_SCHEME": "gpt",
"ID_PART_ENTRY_SIZE": "20967425",
"ID_PART_ENTRY_TYPE": "a19d880f-05fc-4d3b-a006-743f0f84911e",
"ID_PART_ENTRY_UUID": "8f81c7b5-c229-4298-96b3-abdf242d4017",
"ID_PART_TABLE_TYPE": "gpt",
"ID_SERIAL": "64bddb21-61f3-4869-8",
"MAJOR": "253",
"MINOR": "97",
"SUBSYSTEM": "block",
"USEC_INITIALIZED": "29859",
"attrs": {
"alignment_offset": "0",
"dev": "253:97",
"discard_alignment": "0",
"inflight": " 0 0",
"partition": "1",
"ro": "0",
"size": "10735321600",
"start": "2048",
"stat": " 26 0 208 40 0 0 0 0 0 40 40",
"subsystem": "block",
"uevent": "MAJOR=253\nMINOR=97\nDEVNAME=vdg1\nDEVTYPE=partition"
}
}
}
}

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -1,797 +0,0 @@
{
"network": {
"eth0": {
"bond": {
"is_master": false,
"is_slave": false,
"mode": null,
"slaves": null
},
"bridge": {
"interfaces": [],
"is_bridge": false,
"is_port": false,
"options": {}
},
"hardware": {
"DEVPATH": "/devices/pci0000:00/0000:00:14.0/usb4/4-2/4-2.1/4-2.1.1/4-2.1.1:1.0/net/eth0",
"ID_BUS": "usb",
"ID_MM_CANDIDATE": "1",
"ID_MODEL": "AX88179",
"ID_MODEL_ENC": "AX88179",
"ID_MODEL_ID": "1790",
"ID_NET_NAME_MAC": "enx000acd264533",
"ID_NET_NAME_PATH": "enp0s20u2u1u1",
"ID_OUI_FROM_DATABASE": "Sunrich Technology Limited",
"ID_REVISION": "0100",
"ID_SERIAL": "ASIX_Elec._Corp._AX88179_00000000000001",
"ID_SERIAL_SHORT": "00000000000001",
"ID_TYPE": "generic",
"ID_USB_CLASS_FROM_DATABASE": "Vendor Specific Class",
"ID_USB_DRIVER": "ax88179_178a",
"ID_USB_INTERFACES": ":ffff00:",
"ID_USB_INTERFACE_NUM": "00",
"ID_USB_SUBCLASS_FROM_DATABASE": "Vendor Specific Subclass",
"ID_VENDOR": "ASIX_Elec._Corp.",
"ID_VENDOR_ENC": "ASIX\\x20Elec.\\x20Corp.",
"ID_VENDOR_FROM_DATABASE": "ASIX Electronics Corp.",
"ID_VENDOR_ID": "0b95",
"IFINDEX": "7",
"INTERFACE": "eth0",
"SUBSYSTEM": "net",
"USEC_INITIALIZED": "259947546",
"attrs": {
"addr_assign_type": "0",
"addr_len": "6",
"address": "00:0a:cd:26:45:33",
"broadcast": "ff:ff:ff:ff:ff:ff",
"carrier": "1",
"dev_id": "0x0",
"device": null,
"dormant": "0",
"duplex": "full",
"flags": "0x1003",
"ifalias": "",
"ifindex": "7",
"iflink": "7",
"link_mode": "0",
"mtu": "1500",
"netdev_group": "0",
"operstate": "up",
"phys_port_id": null,
"speed": "1000",
"subsystem": "net",
"tx_queue_len": "1000",
"type": "1",
"uevent": "INTERFACE=eth0\nIFINDEX=7"
}
},
"ip": {
"addr": "192.168.11.58",
"broadcast": "192.168.11.255",
"netmask": "255.255.255.0",
"source": {
"config": {
"active": true,
"lease": {
"expire": "2 2014/10/28 01:54:32",
"fixed-address": "192.168.11.59",
"interface": "eth0",
"options": {
"broadcast-address": "192.168.11.255",
"dhcp-lease-time": "86400",
"dhcp-message-type": "5",
"dhcp-rebinding-time": "75600",
"dhcp-renewal-time": "43200",
"dhcp-server-identifier": "192.168.11.1",
"domain-name": "home.woxford.com",
"domain-name-servers": "127.0.0.1",
"host-name": "foudres",
"routers": "192.168.11.1",
"subnet-mask": "255.255.255.0"
},
"rebind": "1 2014/10/27 22:54:32",
"renew": "1 2014/10/27 13:52:33"
}
},
"method": "dhcp",
"provider": "192.168.11.1"
}
},
"type": "eth"
},
"lo": {
"bond": {
"is_master": false,
"is_slave": false,
"mode": null,
"slaves": null
},
"bridge": {
"interfaces": [],
"is_bridge": false,
"is_port": false,
"options": {}
},
"hardware": {
"DEVPATH": "/devices/virtual/net/lo",
"ID_MM_CANDIDATE": "1",
"IFINDEX": "1",
"INTERFACE": "lo",
"SUBSYSTEM": "net",
"USEC_INITIALIZED": "4194",
"attrs": {
"addr_assign_type": "0",
"addr_len": "6",
"address": "00:00:00:00:00:00",
"broadcast": "00:00:00:00:00:00",
"carrier": "1",
"dev_id": "0x0",
"dormant": "0",
"duplex": null,
"flags": "0x9",
"ifalias": "",
"ifindex": "1",
"iflink": "1",
"link_mode": "0",
"mtu": "65536",
"netdev_group": "0",
"operstate": "unknown",
"phys_port_id": null,
"speed": null,
"subsystem": "net",
"tx_queue_len": "0",
"type": "772",
"uevent": "INTERFACE=lo\nIFINDEX=1"
}
},
"ip": {
"addr": "127.0.0.1",
"netmask": "255.0.0.0",
"peer": "127.0.0.1",
"source": {
"config": {
"auto": true,
"family": "inet",
"method": "loopback"
},
"method": "loopback",
"provider": "local config"
}
},
"type": "lo"
},
"lxcbr0": {
"bond": {
"is_master": false,
"is_slave": false,
"mode": null,
"slaves": null
},
"bridge": {
"interfaces": [],
"is_bridge": true,
"is_port": false,
"options": {
"ageing_time": "30000",
"bridge_id": "8000.000000000000",
"forward_delay": "1500",
"gc_timer": "26590",
"group_addr": "1:80:c2:0:0:0",
"group_fwd_mask": "0x0",
"hash_elasticity": "4",
"hash_max": "512",
"hello_time": "200",
"hello_timer": "44",
"max_age": "2000",
"multicast_last_member_count": "2",
"multicast_last_member_interval": "100",
"multicast_membership_interval": "26000",
"multicast_querier": "0",
"multicast_querier_interval": "25500",
"multicast_query_interval": "12500",
"multicast_query_response_interval": "1000",
"multicast_query_use_ifaddr": "0",
"multicast_router": "1",
"multicast_snooping": "1",
"multicast_startup_query_count": "2",
"multicast_startup_query_interval": "3124",
"nf_call_arptables": "0",
"nf_call_ip6tables": "0",
"nf_call_iptables": "0",
"priority": "32768",
"root_id": "8000.000000000000",
"root_path_cost": "0",
"root_port": "0",
"stp_state": "0",
"tcn_timer": "0",
"topology_change": "0",
"topology_change_detected": "0",
"topology_change_timer": "0",
"vlan_filtering": "0"
}
},
"hardware": {
"DEVPATH": "/devices/virtual/net/lxcbr0",
"DEVTYPE": "bridge",
"ID_MM_CANDIDATE": "1",
"IFINDEX": "3",
"INTERFACE": "lxcbr0",
"SUBSYSTEM": "net",
"USEC_INITIALIZED": "56500",
"attrs": {
"addr_assign_type": "1",
"addr_len": "6",
"address": "aa:f1:a9:7d:ad:d5",
"brforward": "",
"broadcast": "ff:ff:ff:ff:ff:ff",
"carrier": "1",
"dev_id": "0x0",
"dormant": "0",
"duplex": null,
"flags": "0x1003",
"ifalias": "",
"ifindex": "3",
"iflink": "3",
"link_mode": "0",
"mtu": "1500",
"netdev_group": "0",
"operstate": "unknown",
"phys_port_id": null,
"speed": null,
"subsystem": "net",
"tx_queue_len": "0",
"type": "1",
"uevent": "DEVTYPE=bridge\nINTERFACE=lxcbr0\nIFINDEX=3"
}
},
"ip": {
"addr": "10.0.3.1",
"broadcast": "10.0.3.1",
"netmask": "255.255.255.0",
"source": {
"config": null,
"method": "manual",
"provider": null
}
},
"type": "bridge"
},
"tun0": {
"bond": {
"is_master": false,
"is_slave": false,
"mode": null,
"slaves": null
},
"bridge": {
"interfaces": [],
"is_bridge": false,
"is_port": false,
"options": {}
},
"hardware": {
"DEVPATH": "/devices/virtual/net/tun0",
"ID_MM_CANDIDATE": "1",
"IFINDEX": "8",
"INTERFACE": "tun0",
"SUBSYSTEM": "net",
"USEC_INITIALIZED": "22325537136",
"attrs": {
"addr_assign_type": "0",
"addr_len": "0",
"address": "",
"broadcast": "",
"carrier": "1",
"dev_id": "0x0",
"dormant": "0",
"duplex": "full",
"flags": "0x1091",
"group": "-1",
"ifalias": "",
"ifindex": "8",
"iflink": "8",
"link_mode": "0",
"mtu": "1350",
"netdev_group": "0",
"operstate": "unknown",
"owner": "-1",
"phys_port_id": null,
"speed": "10",
"subsystem": "net",
"tun_flags": "0x2001",
"tx_queue_len": "100",
"type": "65534",
"uevent": "INTERFACE=tun0\nIFINDEX=8"
}
},
"ip": {
"addr": "10.172.64.178",
"netmask": "255.255.192.0",
"peer": "10.172.127.255",
"source": {
"config": null,
"method": "manual",
"provider": null
}
},
"type": "tun"
},
"virbr0": {
"bond": {
"is_master": false,
"is_slave": false,
"mode": null,
"slaves": null
},
"bridge": {
"interfaces": [],
"is_bridge": true,
"is_port": false,
"options": {
"ageing_time": "30000",
"bridge_id": "8000.000000000000",
"forward_delay": "200",
"gc_timer": "26795",
"group_addr": "1:80:c2:0:0:0",
"group_fwd_mask": "0x0",
"hash_elasticity": "4",
"hash_max": "512",
"hello_time": "200",
"hello_timer": "144",
"max_age": "2000",
"multicast_last_member_count": "2",
"multicast_last_member_interval": "100",
"multicast_membership_interval": "26000",
"multicast_querier": "0",
"multicast_querier_interval": "25500",
"multicast_query_interval": "12500",
"multicast_query_response_interval": "1000",
"multicast_query_use_ifaddr": "0",
"multicast_router": "1",
"multicast_snooping": "1",
"multicast_startup_query_count": "2",
"multicast_startup_query_interval": "3124",
"nf_call_arptables": "0",
"nf_call_ip6tables": "0",
"nf_call_iptables": "0",
"priority": "32768",
"root_id": "8000.000000000000",
"root_path_cost": "0",
"root_port": "0",
"stp_state": "1",
"tcn_timer": "0",
"topology_change": "0",
"topology_change_detected": "0",
"topology_change_timer": "0",
"vlan_filtering": "0"
}
},
"hardware": {
"DEVPATH": "/devices/virtual/net/virbr0",
"DEVTYPE": "bridge",
"ID_MM_CANDIDATE": "1",
"IFINDEX": "4",
"INTERFACE": "virbr0",
"SUBSYSTEM": "net",
"USEC_INITIALIZED": "45741",
"attrs": {
"addr_assign_type": "1",
"addr_len": "6",
"address": "96:40:92:fa:8c:f7",
"brforward": "",
"broadcast": "ff:ff:ff:ff:ff:ff",
"carrier": "0",
"dev_id": "0x0",
"dormant": "0",
"duplex": null,
"flags": "0x1003",
"ifalias": "",
"ifindex": "4",
"iflink": "4",
"link_mode": "0",
"mtu": "1500",
"netdev_group": "0",
"operstate": "down",
"phys_port_id": null,
"speed": null,
"subsystem": "net",
"tx_queue_len": "0",
"type": "1",
"uevent": "DEVTYPE=bridge\nINTERFACE=virbr0\nIFINDEX=4"
}
},
"ip": {
"addr": "192.168.122.1",
"broadcast": "192.168.122.255",
"netmask": "255.255.255.0",
"source": {
"config": null,
"method": "manual",
"provider": null
}
},
"type": "bridge"
},
"wlan0": {
"bond": {
"is_master": false,
"is_slave": false,
"mode": null,
"slaves": null
},
"bridge": {
"interfaces": [],
"is_bridge": false,
"is_port": false,
"options": {}
},
"hardware": {
"DEVPATH": "/devices/pci0000:00/0000:00:1c.1/0000:03:00.0/net/wlan0",
"DEVTYPE": "wlan",
"ID_BUS": "pci",
"ID_MM_CANDIDATE": "1",
"ID_MODEL_FROM_DATABASE": "Centrino Advanced-N 6205 [Taylor Peak]",
"ID_MODEL_ID": "0x0085",
"ID_NET_NAME_MAC": "wlx843a4bcd1778",
"ID_NET_NAME_PATH": "wlp3s0",
"ID_OUI_FROM_DATABASE": "Intel Corporate",
"ID_PCI_CLASS_FROM_DATABASE": "Network controller",
"ID_PCI_SUBCLASS_FROM_DATABASE": "Network controller",
"ID_VENDOR_FROM_DATABASE": "Intel Corporation",
"ID_VENDOR_ID": "0x8086",
"IFINDEX": "2",
"INTERFACE": "wlan0",
"SUBSYSTEM": "net",
"USEC_INITIALIZED": "63001",
"attrs": {
"addr_assign_type": "0",
"addr_len": "6",
"address": "84:3a:4b:cd:17:78",
"broadcast": "ff:ff:ff:ff:ff:ff",
"carrier": "1",
"dev_id": "0x0",
"device": null,
"dormant": "0",
"duplex": null,
"flags": "0x1003",
"ifalias": "",
"ifindex": "2",
"iflink": "2",
"link_mode": "1",
"mtu": "1500",
"netdev_group": "0",
"operstate": "up",
"phy80211": null,
"phys_port_id": null,
"speed": null,
"subsystem": "net",
"tx_queue_len": "1000",
"type": "1",
"uevent": "DEVTYPE=wlan\nINTERFACE=wlan0\nIFINDEX=2"
}
},
"ip": {
"addr": "192.168.11.42",
"broadcast": "192.168.11.255",
"netmask": "255.255.255.0",
"source": {
"config": {
"active": true,
"lease": {
"expire": "1 2015/10/12 01:59:07",
"fixed-address": "172.19.131.42",
"interface": "wlan0",
"options": {
"dhcp-lease-time": "2700",
"dhcp-message-type": "5",
"dhcp-server-identifier": "172.19.131.2",
"domain-name-servers": "127.0.0.1",
"routers": "172.19.131.2",
"subnet-mask": "255.255.255.0",
"subnet-selection": "172.19.131.0",
"unknown-252": "68:74:74:70:3a:2f:2f:31:37:32:2e:31:39:2e:31:33:34:2e:32:a"
},
"rebind": "1 2015/10/12 01:53:29",
"renew": "1 2015/10/12 01:34:07"
}
},
"method": "dhcp",
"provider": "172.19.131.2"
}
},
"type": "wlan"
}
},
"storage": {
"/dev/sda": {
"DEVLINKS": "/dev/disk/by-id/ata-SanDisk_SD5SG2128G1052E_133507400177 /dev/disk/by-id/wwn-0x5001b44a213e3df1",
"DEVNAME": "/dev/sda",
"DEVPATH": "/devices/pci0000:00/0000:00:1f.2/ata1/host0/target0:0:0/0:0:0:0/block/sda",
"DEVTYPE": "disk",
"ID_ATA": "1",
"ID_ATA_DOWNLOAD_MICROCODE": "1",
"ID_ATA_FEATURE_SET_APM": "1",
"ID_ATA_FEATURE_SET_APM_CURRENT_VALUE": "128",
"ID_ATA_FEATURE_SET_APM_ENABLED": "1",
"ID_ATA_FEATURE_SET_HPA": "1",
"ID_ATA_FEATURE_SET_HPA_ENABLED": "1",
"ID_ATA_FEATURE_SET_PM": "1",
"ID_ATA_FEATURE_SET_PM_ENABLED": "1",
"ID_ATA_FEATURE_SET_SECURITY": "1",
"ID_ATA_FEATURE_SET_SECURITY_ENABLED": "0",
"ID_ATA_FEATURE_SET_SECURITY_ENHANCED_ERASE_UNIT_MIN": "12",
"ID_ATA_FEATURE_SET_SECURITY_ERASE_UNIT_MIN": "2",
"ID_ATA_FEATURE_SET_SECURITY_FROZEN": "1",
"ID_ATA_FEATURE_SET_SMART": "1",
"ID_ATA_FEATURE_SET_SMART_ENABLED": "1",
"ID_ATA_ROTATION_RATE_RPM": "0",
"ID_ATA_SATA": "1",
"ID_ATA_SATA_SIGNAL_RATE_GEN1": "1",
"ID_ATA_SATA_SIGNAL_RATE_GEN2": "1",
"ID_ATA_WRITE_CACHE": "1",
"ID_ATA_WRITE_CACHE_ENABLED": "1",
"ID_BUS": "ata",
"ID_MODEL": "SanDisk_SD5SG2128G1052E",
"ID_MODEL_ENC": "SanDisk\\x20SD5SG2128G1052E\\x20\\x20\\x20\\x20\\x20\\x20\\x20\\x20\\x20\\x20\\x20\\x20\\x20\\x20\\x20\\x20\\x20",
"ID_PART_TABLE_TYPE": "dos",
"ID_REVISION": "10.04.01",
"ID_SERIAL": "SanDisk_SD5SG2128G1052E_133507400177",
"ID_SERIAL_SHORT": "133507400177",
"ID_TYPE": "disk",
"ID_WWN": "0x5001b44a213e3df1",
"ID_WWN_WITH_EXTENSION": "0x5001b44a213e3df1",
"MAJOR": "8",
"MINOR": "0",
"SUBSYSTEM": "block",
"UDISKS_ATA_SMART_IS_AVAILABLE": "1",
"UDISKS_PARTITION_TABLE": "1",
"UDISKS_PARTITION_TABLE_COUNT": "3",
"UDISKS_PARTITION_TABLE_SCHEME": "mbr",
"UDISKS_PRESENTATION_NOPOLICY": "0",
"USEC_INITIALIZED": "96384",
"attrs": {
"alignment_offset": "0",
"bdi": null,
"capability": "50",
"dev": "8:0",
"device": null,
"discard_alignment": "0",
"events": "",
"events_async": "",
"events_poll_msecs": "-1",
"ext_range": "256",
"inflight": " 0 0",
"range": "16",
"removable": "0",
"ro": "0",
"size": "128035676160",
"stat": " 170114 11613 3795718 176052 636087 509464 27915856 1530132 0 364272 1705716",
"subsystem": "block",
"uevent": "MAJOR=8\nMINOR=0\nDEVNAME=sda\nDEVTYPE=disk"
}
},
"/dev/sda1": {
"DEVLINKS": "/dev/disk/by-id/ata-SanDisk_SD5SG2128G1052E_133507400177-part1 /dev/disk/by-id/wwn-0x5001b44a213e3df1-part1 /dev/disk/by-uuid/aa553e3a-3e79-4f9f-8be3-e40e357c06f7",
"DEVNAME": "/dev/sda1",
"DEVPATH": "/devices/pci0000:00/0000:00:1f.2/ata1/host0/target0:0:0/0:0:0:0/block/sda/sda1",
"DEVTYPE": "partition",
"ID_ATA": "1",
"ID_ATA_DOWNLOAD_MICROCODE": "1",
"ID_ATA_FEATURE_SET_APM": "1",
"ID_ATA_FEATURE_SET_APM_CURRENT_VALUE": "128",
"ID_ATA_FEATURE_SET_APM_ENABLED": "1",
"ID_ATA_FEATURE_SET_HPA": "1",
"ID_ATA_FEATURE_SET_HPA_ENABLED": "1",
"ID_ATA_FEATURE_SET_PM": "1",
"ID_ATA_FEATURE_SET_PM_ENABLED": "1",
"ID_ATA_FEATURE_SET_SECURITY": "1",
"ID_ATA_FEATURE_SET_SECURITY_ENABLED": "0",
"ID_ATA_FEATURE_SET_SECURITY_ENHANCED_ERASE_UNIT_MIN": "12",
"ID_ATA_FEATURE_SET_SECURITY_ERASE_UNIT_MIN": "2",
"ID_ATA_FEATURE_SET_SECURITY_FROZEN": "1",
"ID_ATA_FEATURE_SET_SMART": "1",
"ID_ATA_FEATURE_SET_SMART_ENABLED": "1",
"ID_ATA_ROTATION_RATE_RPM": "0",
"ID_ATA_SATA": "1",
"ID_ATA_SATA_SIGNAL_RATE_GEN1": "1",
"ID_ATA_SATA_SIGNAL_RATE_GEN2": "1",
"ID_ATA_WRITE_CACHE": "1",
"ID_ATA_WRITE_CACHE_ENABLED": "1",
"ID_BUS": "ata",
"ID_FS_TYPE": "ext4",
"ID_FS_USAGE": "filesystem",
"ID_FS_UUID": "aa553e3a-3e79-4f9f-8be3-e40e357c06f7",
"ID_FS_UUID_ENC": "aa553e3a-3e79-4f9f-8be3-e40e357c06f7",
"ID_FS_VERSION": "1.0",
"ID_MODEL": "SanDisk_SD5SG2128G1052E",
"ID_MODEL_ENC": "SanDisk\\x20SD5SG2128G1052E\\x20\\x20\\x20\\x20\\x20\\x20\\x20\\x20\\x20\\x20\\x20\\x20\\x20\\x20\\x20\\x20\\x20",
"ID_PART_ENTRY_DISK": "8:0",
"ID_PART_ENTRY_FLAGS": "0x80",
"ID_PART_ENTRY_NUMBER": "1",
"ID_PART_ENTRY_OFFSET": "2048",
"ID_PART_ENTRY_SCHEME": "dos",
"ID_PART_ENTRY_SIZE": "233910272",
"ID_PART_ENTRY_TYPE": "0x83",
"ID_PART_TABLE_TYPE": "dos",
"ID_REVISION": "10.04.01",
"ID_SERIAL": "SanDisk_SD5SG2128G1052E_133507400177",
"ID_SERIAL_SHORT": "133507400177",
"ID_TYPE": "disk",
"ID_WWN": "0x5001b44a213e3df1",
"ID_WWN_WITH_EXTENSION": "0x5001b44a213e3df1",
"MAJOR": "8",
"MINOR": "1",
"SUBSYSTEM": "block",
"UDISKS_PARTITION": "1",
"UDISKS_PARTITION_ALIGNMENT_OFFSET": "0",
"UDISKS_PARTITION_FLAGS": "boot",
"UDISKS_PARTITION_NUMBER": "1",
"UDISKS_PARTITION_OFFSET": "1048576",
"UDISKS_PARTITION_SCHEME": "mbr",
"UDISKS_PARTITION_SIZE": "119762059264",
"UDISKS_PARTITION_SLAVE": "/sys/devices/pci0000:00/0000:00:1f.2/ata1/host0/target0:0:0/0:0:0:0/block/sda",
"UDISKS_PARTITION_TYPE": "0x83",
"UDISKS_PRESENTATION_NOPOLICY": "0",
"USEC_INITIALIZED": "96408",
"attrs": {
"alignment_offset": "0",
"dev": "8:1",
"discard_alignment": "0",
"inflight": " 0 0",
"partition": "1",
"ro": "0",
"size": "119762059264",
"start": "2048",
"stat": " 169233 9459 3771450 175260 582479 508899 27910880 1503624 0 338252 1683468",
"subsystem": "block",
"uevent": "MAJOR=8\nMINOR=1\nDEVNAME=sda1\nDEVTYPE=partition"
}
},
"/dev/sda2": {
"DEVLINKS": "/dev/disk/by-id/ata-SanDisk_SD5SG2128G1052E_133507400177-part2 /dev/disk/by-id/wwn-0x5001b44a213e3df1-part2",
"DEVNAME": "/dev/sda2",
"DEVPATH": "/devices/pci0000:00/0000:00:1f.2/ata1/host0/target0:0:0/0:0:0:0/block/sda/sda2",
"DEVTYPE": "partition",
"ID_ATA": "1",
"ID_ATA_DOWNLOAD_MICROCODE": "1",
"ID_ATA_FEATURE_SET_APM": "1",
"ID_ATA_FEATURE_SET_APM_CURRENT_VALUE": "128",
"ID_ATA_FEATURE_SET_APM_ENABLED": "1",
"ID_ATA_FEATURE_SET_HPA": "1",
"ID_ATA_FEATURE_SET_HPA_ENABLED": "1",
"ID_ATA_FEATURE_SET_PM": "1",
"ID_ATA_FEATURE_SET_PM_ENABLED": "1",
"ID_ATA_FEATURE_SET_SECURITY": "1",
"ID_ATA_FEATURE_SET_SECURITY_ENABLED": "0",
"ID_ATA_FEATURE_SET_SECURITY_ENHANCED_ERASE_UNIT_MIN": "12",
"ID_ATA_FEATURE_SET_SECURITY_ERASE_UNIT_MIN": "2",
"ID_ATA_FEATURE_SET_SECURITY_FROZEN": "1",
"ID_ATA_FEATURE_SET_SMART": "1",
"ID_ATA_FEATURE_SET_SMART_ENABLED": "1",
"ID_ATA_ROTATION_RATE_RPM": "0",
"ID_ATA_SATA": "1",
"ID_ATA_SATA_SIGNAL_RATE_GEN1": "1",
"ID_ATA_SATA_SIGNAL_RATE_GEN2": "1",
"ID_ATA_WRITE_CACHE": "1",
"ID_ATA_WRITE_CACHE_ENABLED": "1",
"ID_BUS": "ata",
"ID_MODEL": "SanDisk_SD5SG2128G1052E",
"ID_MODEL_ENC": "SanDisk\\x20SD5SG2128G1052E\\x20\\x20\\x20\\x20\\x20\\x20\\x20\\x20\\x20\\x20\\x20\\x20\\x20\\x20\\x20\\x20\\x20",
"ID_PART_ENTRY_DISK": "8:0",
"ID_PART_ENTRY_NUMBER": "2",
"ID_PART_ENTRY_OFFSET": "233914366",
"ID_PART_ENTRY_SCHEME": "dos",
"ID_PART_ENTRY_SIZE": "16154626",
"ID_PART_ENTRY_TYPE": "0x5",
"ID_PART_TABLE_TYPE": "dos",
"ID_REVISION": "10.04.01",
"ID_SERIAL": "SanDisk_SD5SG2128G1052E_133507400177",
"ID_SERIAL_SHORT": "133507400177",
"ID_TYPE": "disk",
"ID_WWN": "0x5001b44a213e3df1",
"ID_WWN_WITH_EXTENSION": "0x5001b44a213e3df1",
"MAJOR": "8",
"MINOR": "2",
"SUBSYSTEM": "block",
"UDISKS_PARTITION": "1",
"UDISKS_PARTITION_ALIGNMENT_OFFSET": "0",
"UDISKS_PARTITION_NUMBER": "2",
"UDISKS_PARTITION_OFFSET": "119764155392",
"UDISKS_PARTITION_SCHEME": "mbr",
"UDISKS_PARTITION_SIZE": "8271168512",
"UDISKS_PARTITION_SLAVE": "/sys/devices/pci0000:00/0000:00:1f.2/ata1/host0/target0:0:0/0:0:0:0/block/sda",
"UDISKS_PARTITION_TYPE": "0x05",
"UDISKS_PRESENTATION_NOPOLICY": "0",
"USEC_INITIALIZED": "96426",
"attrs": {
"alignment_offset": "0",
"dev": "8:2",
"discard_alignment": "0",
"inflight": " 0 0",
"partition": "2",
"ro": "0",
"size": "1024",
"start": "233914366",
"stat": " 2 0 4 4 0 0 0 0 0 4 4",
"subsystem": "block",
"uevent": "MAJOR=8\nMINOR=2\nDEVNAME=sda2\nDEVTYPE=partition"
}
},
"/dev/sda5": {
"DEVLINKS": "/dev/disk/by-id/ata-SanDisk_SD5SG2128G1052E_133507400177-part5 /dev/disk/by-id/wwn-0x5001b44a213e3df1-part5 /dev/disk/by-uuid/d7de9528-c3f7-40ea-a43d-59c7d7beb216",
"DEVNAME": "/dev/sda5",
"DEVPATH": "/devices/pci0000:00/0000:00:1f.2/ata1/host0/target0:0:0/0:0:0:0/block/sda/sda5",
"DEVTYPE": "partition",
"ID_ATA": "1",
"ID_ATA_DOWNLOAD_MICROCODE": "1",
"ID_ATA_FEATURE_SET_APM": "1",
"ID_ATA_FEATURE_SET_APM_CURRENT_VALUE": "128",
"ID_ATA_FEATURE_SET_APM_ENABLED": "1",
"ID_ATA_FEATURE_SET_HPA": "1",
"ID_ATA_FEATURE_SET_HPA_ENABLED": "1",
"ID_ATA_FEATURE_SET_PM": "1",
"ID_ATA_FEATURE_SET_PM_ENABLED": "1",
"ID_ATA_FEATURE_SET_SECURITY": "1",
"ID_ATA_FEATURE_SET_SECURITY_ENABLED": "0",
"ID_ATA_FEATURE_SET_SECURITY_ENHANCED_ERASE_UNIT_MIN": "12",
"ID_ATA_FEATURE_SET_SECURITY_ERASE_UNIT_MIN": "2",
"ID_ATA_FEATURE_SET_SECURITY_FROZEN": "1",
"ID_ATA_FEATURE_SET_SMART": "1",
"ID_ATA_FEATURE_SET_SMART_ENABLED": "1",
"ID_ATA_ROTATION_RATE_RPM": "0",
"ID_ATA_SATA": "1",
"ID_ATA_SATA_SIGNAL_RATE_GEN1": "1",
"ID_ATA_SATA_SIGNAL_RATE_GEN2": "1",
"ID_ATA_WRITE_CACHE": "1",
"ID_ATA_WRITE_CACHE_ENABLED": "1",
"ID_BUS": "ata",
"ID_FS_TYPE": "swap",
"ID_FS_USAGE": "other",
"ID_FS_UUID": "d7de9528-c3f7-40ea-a43d-59c7d7beb216",
"ID_FS_UUID_ENC": "d7de9528-c3f7-40ea-a43d-59c7d7beb216",
"ID_FS_VERSION": "2",
"ID_MODEL": "SanDisk_SD5SG2128G1052E",
"ID_MODEL_ENC": "SanDisk\\x20SD5SG2128G1052E\\x20\\x20\\x20\\x20\\x20\\x20\\x20\\x20\\x20\\x20\\x20\\x20\\x20\\x20\\x20\\x20\\x20",
"ID_PART_ENTRY_DISK": "8:0",
"ID_PART_ENTRY_NUMBER": "5",
"ID_PART_ENTRY_OFFSET": "233914368",
"ID_PART_ENTRY_SCHEME": "dos",
"ID_PART_ENTRY_SIZE": "16154624",
"ID_PART_ENTRY_TYPE": "0x82",
"ID_PART_TABLE_TYPE": "dos",
"ID_REVISION": "10.04.01",
"ID_SERIAL": "SanDisk_SD5SG2128G1052E_133507400177",
"ID_SERIAL_SHORT": "133507400177",
"ID_TYPE": "disk",
"ID_WWN": "0x5001b44a213e3df1",
"ID_WWN_WITH_EXTENSION": "0x5001b44a213e3df1",
"MAJOR": "8",
"MINOR": "5",
"SUBSYSTEM": "block",
"UDISKS_PARTITION": "1",
"UDISKS_PARTITION_ALIGNMENT_OFFSET": "0",
"UDISKS_PARTITION_NUMBER": "5",
"UDISKS_PARTITION_OFFSET": "119764156416",
"UDISKS_PARTITION_SCHEME": "mbr",
"UDISKS_PARTITION_SIZE": "8271167488",
"UDISKS_PARTITION_SLAVE": "/sys/devices/pci0000:00/0000:00:1f.2/ata1/host0/target0:0:0/0:0:0:0/block/sda",
"UDISKS_PARTITION_TYPE": "0x82",
"UDISKS_PRESENTATION_NOPOLICY": "0",
"USEC_INITIALIZED": "96437",
"attrs": {
"alignment_offset": "0",
"dev": "8:5",
"discard_alignment": "0",
"inflight": " 0 0",
"partition": "5",
"ro": "0",
"size": "8271167488",
"start": "233914368",
"stat": " 318 48 2928 256 57 565 4976 64 0 288 320",
"subsystem": "block",
"uevent": "MAJOR=8\nMINOR=5\nDEVNAME=sda5\nDEVTYPE=partition"
}
}
}
}

1419
examples/mwhudson.json Normal file

File diff suppressed because it is too large Load Diff

View File

@ -1,242 +0,0 @@
{
"network": {
"lo": {
"hardware": {
"DEVPATH": "/devices/virtual/net/lo",
"IFINDEX": "1",
"INTERFACE": "lo",
"SUBSYSTEM": "net",
"attrs": {
"addr_assign_type": "0",
"addr_len": "6",
"address": "00:00:00:00:00:00",
"broadcast": "00:00:00:00:00:00",
"carrier": "1",
"carrier_changes": "0",
"dev_id": "0x0",
"dev_port": "0",
"dormant": "0",
"duplex": null,
"flags": "0x9",
"gro_flush_timeout": "0",
"ifalias": "",
"ifindex": "1",
"iflink": "1",
"link_mode": "0",
"mtu": "65536",
"name_assign_type": null,
"netdev_group": "0",
"operstate": "unknown",
"phys_port_id": null,
"phys_switch_id": null,
"speed": null,
"subsystem": "net",
"tx_queue_len": "0",
"type": "772",
"uevent": "INTERFACE=lo\nIFINDEX=1"
}
},
"ip": {
"addr": "127.0.0.1",
"netmask": "255.0.0.0",
"peer": "127.0.0.1"
},
"type": "lo"
}
},
"storage": {
"/dev/bcache0": {
"DEVNAME": "/dev/bcache0",
"DEVPATH": "/devices/virtual/block/bcache0",
"DEVTYPE": "disk",
"MAJOR": "251",
"MINOR": "0",
"SUBSYSTEM": "block",
"attrs": {
"alignment_offset": "0",
"bcache": null,
"bdi": null,
"capability": "10",
"dev": "251:0",
"discard_alignment": "0",
"ext_range": "1",
"inflight": " 0 0",
"range": "1",
"removable": "0",
"ro": "0",
"size": "2000397877248",
"stat": " 118340 0 5059178 94484 201086 0 5860600 910672 0 133096 1005236",
"subsystem": "block",
"uevent": "MAJOR=251\nMINOR=0\nDEVNAME=bcache0\nDEVTYPE=disk"
}
},
"/dev/sda": {
"DEVNAME": "/dev/sda",
"DEVPATH": "/devices/pci0000:00/0000:00:1f.2/ata1/host0/target0:0:0/0:0:0:0/block/sda",
"DEVTYPE": "disk",
"MAJOR": "8",
"MINOR": "0",
"SUBSYSTEM": "block",
"attrs": {
"alignment_offset": "0",
"bdi": null,
"capability": "50",
"dev": "8:0",
"device": null,
"discard_alignment": "0",
"events": "",
"events_async": "",
"events_poll_msecs": "-1",
"ext_range": "256",
"inflight": " 0 0",
"range": "16",
"removable": "0",
"ro": "0",
"size": "256060514304",
"stat": " 197956 4626 10095451 136508 82998 160783 6481663 518564 0 143796 655656",
"subsystem": "block",
"uevent": "MAJOR=8\nMINOR=0\nDEVNAME=sda\nDEVTYPE=disk"
}
},
"/dev/sda1": {
"DEVNAME": "/dev/sda1",
"DEVPATH": "/devices/pci0000:00/0000:00:1f.2/ata1/host0/target0:0:0/0:0:0:0/block/sda/sda1",
"DEVTYPE": "partition",
"MAJOR": "8",
"MINOR": "1",
"SUBSYSTEM": "block",
"attrs": {
"alignment_offset": "0",
"dev": "8:1",
"discard_alignment": "0",
"inflight": " 0 0",
"partition": "1",
"ro": "0",
"size": "4094689280",
"start": "2048",
"stat": " 102 0 1944 164 0 0 0 0 0 164 164",
"subsystem": "block",
"uevent": "MAJOR=8\nMINOR=1\nDEVNAME=sda1\nDEVTYPE=partition"
}
},
"/dev/sda2": {
"DEVNAME": "/dev/sda2",
"DEVPATH": "/devices/pci0000:00/0000:00:1f.2/ata1/host0/target0:0:0/0:0:0:0/block/sda/sda2",
"DEVTYPE": "partition",
"MAJOR": "8",
"MINOR": "2",
"SUBSYSTEM": "block",
"attrs": {
"alignment_offset": "0",
"dev": "8:2",
"discard_alignment": "0",
"inflight": " 0 0",
"partition": "2",
"ro": "0",
"size": "26708279296",
"start": "7999488",
"stat": " 50380 3804 2602898 67292 6342 8616 1317944 297324 0 23584 364612",
"subsystem": "block",
"uevent": "MAJOR=8\nMINOR=2\nDEVNAME=sda2\nDEVTYPE=partition"
}
},
"/dev/sda3": {
"DEVNAME": "/dev/sda3",
"DEVPATH": "/devices/pci0000:00/0000:00:1f.2/ata1/host0/target0:0:0/0:0:0:0/block/sda/sda3",
"DEVTYPE": "partition",
"MAJOR": "8",
"MINOR": "3",
"SUBSYSTEM": "block",
"attrs": {
"alignment_offset": "0",
"dev": "8:3",
"discard_alignment": "0",
"inflight": " 0 0",
"partition": "3",
"ro": "0",
"size": "225256144896",
"start": "60164096",
"stat": " 147370 822 7488897 69040 76646 152167 5163719 221212 0 130124 290208",
"subsystem": "block",
"uevent": "MAJOR=8\nMINOR=3\nDEVNAME=sda3\nDEVTYPE=partition"
}
},
"/dev/sdb": {
"DEVNAME": "/dev/sdb",
"DEVPATH": "/devices/pci0000:00/0000:00:1f.2/ata2/host1/target1:0:0/1:0:0:0/block/sdb",
"DEVTYPE": "disk",
"MAJOR": "8",
"MINOR": "16",
"SUBSYSTEM": "block",
"attrs": {
"alignment_offset": "0",
"bdi": null,
"capability": "50",
"dev": "8:16",
"device": null,
"discard_alignment": "0",
"events": "",
"events_async": "",
"events_poll_msecs": "-1",
"ext_range": "256",
"inflight": " 0 0",
"range": "16",
"removable": "0",
"ro": "0",
"size": "2000398934016",
"stat": " 4430 73 278090 38788 35846 1471 3375701 50368 0 32324 89148",
"subsystem": "block",
"uevent": "MAJOR=8\nMINOR=16\nDEVNAME=sdb\nDEVTYPE=disk"
}
},
"/dev/sdb1": {
"DEVNAME": "/dev/sdb1",
"DEVPATH": "/devices/pci0000:00/0000:00:1f.2/ata2/host1/target1:0:0/1:0:0:0/block/sdb/sdb1",
"DEVTYPE": "partition",
"MAJOR": "8",
"MINOR": "17",
"SUBSYSTEM": "block",
"attrs": {
"alignment_offset": "0",
"dev": "8:17",
"discard_alignment": "0",
"inflight": " 0 0",
"partition": "1",
"ro": "0",
"size": "2000397885440",
"start": "2048",
"stat": " 4344 73 276522 38752 26196 1471 3375701 43504 0 25868 82248",
"subsystem": "block",
"uevent": "MAJOR=8\nMINOR=17\nDEVNAME=sdb1\nDEVTYPE=partition"
}
},
"/dev/sr0": {
"DEVNAME": "/dev/sr0",
"DEVPATH": "/devices/pci0000:00/0000:00:1f.2/ata3/host2/target2:0:0/2:0:0:0/block/sr0",
"DEVTYPE": "disk",
"MAJOR": "11",
"MINOR": "0",
"SUBSYSTEM": "block",
"attrs": {
"alignment_offset": "0",
"bdi": null,
"capability": "119",
"dev": "11:0",
"device": null,
"discard_alignment": "0",
"events": "media_change eject_request",
"events_async": "",
"events_poll_msecs": "2000",
"ext_range": "1",
"inflight": " 0 0",
"range": "1",
"removable": "1",
"ro": "0",
"size": "1073741312",
"stat": " 0 0 0 0 0 0 0 0 0 0 0",
"subsystem": "block",
"uevent": "MAJOR=11\nMINOR=0\nDEVNAME=sr0\nDEVTYPE=disk"
}
}
}
}

View File

@ -1,335 +0,0 @@
{
"network": {
"eth0": {
"bond": {
"is_master": false,
"is_slave": false,
"mode": null,
"slaves": null
},
"bridge": {
"interfaces": [],
"is_bridge": false,
"is_port": false,
"options": {}
},
"hardware": {
"DEVPATH": "/devices/virtual/net/eth0",
"IFINDEX": "7",
"INTERFACE": "eth0",
"SUBSYSTEM": "net",
"attrs": {
"addr_assign_type": "3",
"addr_len": "6",
"address": "00:16:3e:05:f2:b0",
"broadcast": "ff:ff:ff:ff:ff:ff",
"carrier": "1",
"carrier_changes": "2",
"dev_id": "0x0",
"dev_port": "0",
"dormant": "0",
"duplex": "full",
"flags": "0x1003",
"gro_flush_timeout": "0",
"ifalias": "",
"ifindex": "7",
"iflink": "7",
"link_mode": "0",
"mtu": "1500",
"name_assign_type": "4",
"netdev_group": "0",
"operstate": "up",
"phys_port_id": null,
"phys_switch_id": null,
"speed": "10000",
"subsystem": "net",
"tx_queue_len": "1000",
"type": "1",
"uevent": "INTERFACE=eth0\nIFINDEX=7"
}
},
"ip": {
"addr": "10.0.3.124",
"broadcast": "10.0.3.255",
"netmask": "255.255.255.0",
"source": {
"config": {
"active": true,
"lease": {
"expire": "2 2014/10/28 01:54:32",
"fixed-address": "10.0.3.124",
"interface": "eth0",
"options": {
"broadcast-address": "10.0.3.124",
"dhcp-lease-time": "86400",
"dhcp-message-type": "5",
"dhcp-rebinding-time": "75600",
"dhcp-renewal-time": "43200",
"dhcp-server-identifier": "10.0.3.1",
"domain-name-servers": "10.0.3.1",
"host-name": "tribaal",
"routers": "10.0.3.1",
"subnet-mask": "255.255.255.0"
},
"rebind": "1 2014/10/27 22:54:32",
"renew": "1 2014/10/27 13:52:33"
}
},
"method": "dhcp",
"provider": "10.0.3.1"
}
},
"type": "eth"
},
"lo": {
"bond": {
"is_master": false,
"is_slave": false,
"mode": null,
"slaves": null
},
"bridge": {
"interfaces": [],
"is_bridge": false,
"is_port": false,
"options": {}
},
"hardware": {
"DEVPATH": "/devices/virtual/net/lo",
"IFINDEX": "1",
"INTERFACE": "lo",
"SUBSYSTEM": "net",
"attrs": {
"addr_assign_type": "0",
"addr_len": "6",
"address": "00:00:00:00:00:00",
"broadcast": "00:00:00:00:00:00",
"carrier": "1",
"carrier_changes": "0",
"dev_id": "0x0",
"dev_port": "0",
"dormant": "0",
"duplex": null,
"flags": "0x9",
"gro_flush_timeout": "0",
"ifalias": "",
"ifindex": "1",
"iflink": "1",
"link_mode": "0",
"mtu": "65536",
"name_assign_type": null,
"netdev_group": "0",
"operstate": "unknown",
"phys_port_id": null,
"phys_switch_id": null,
"speed": null,
"subsystem": "net",
"tx_queue_len": "0",
"type": "772",
"uevent": "INTERFACE=lo\nIFINDEX=1"
}
},
"ip": {
"addr": "127.0.0.1",
"netmask": "255.0.0.0",
"peer": "127.0.0.1"
},
"type": "lo"
}
},
"storage": {
"/dev/bcache0": {
"DEVNAME": "/dev/bcache0",
"DEVPATH": "/devices/virtual/block/bcache0",
"DEVTYPE": "disk",
"MAJOR": "251",
"MINOR": "0",
"SUBSYSTEM": "block",
"attrs": {
"alignment_offset": "0",
"bcache": null,
"bdi": null,
"capability": "10",
"dev": "251:0",
"discard_alignment": "0",
"ext_range": "1",
"inflight": " 0 0",
"range": "1",
"removable": "0",
"ro": "0",
"size": "2000397877248",
"stat": " 118340 0 5059178 94484 201086 0 5860600 910672 0 133096 1005236",
"subsystem": "block",
"uevent": "MAJOR=251\nMINOR=0\nDEVNAME=bcache0\nDEVTYPE=disk"
}
},
"/dev/sda": {
"DEVNAME": "/dev/sda",
"DEVPATH": "/devices/pci0000:00/0000:00:1f.2/ata1/host0/target0:0:0/0:0:0:0/block/sda",
"DEVTYPE": "disk",
"MAJOR": "8",
"MINOR": "0",
"SUBSYSTEM": "block",
"attrs": {
"alignment_offset": "0",
"bdi": null,
"capability": "50",
"dev": "8:0",
"device": null,
"discard_alignment": "0",
"events": "",
"events_async": "",
"events_poll_msecs": "-1",
"ext_range": "256",
"inflight": " 0 0",
"range": "16",
"removable": "0",
"ro": "0",
"size": "256060514304",
"stat": " 197956 4626 10095451 136508 82998 160783 6481663 518564 0 143796 655656",
"subsystem": "block",
"uevent": "MAJOR=8\nMINOR=0\nDEVNAME=sda\nDEVTYPE=disk"
}
},
"/dev/sda1": {
"DEVNAME": "/dev/sda1",
"DEVPATH": "/devices/pci0000:00/0000:00:1f.2/ata1/host0/target0:0:0/0:0:0:0/block/sda/sda1",
"DEVTYPE": "partition",
"MAJOR": "8",
"MINOR": "1",
"SUBSYSTEM": "block",
"attrs": {
"alignment_offset": "0",
"dev": "8:1",
"discard_alignment": "0",
"inflight": " 0 0",
"partition": "1",
"ro": "0",
"size": "4094689280",
"start": "2048",
"stat": " 102 0 1944 164 0 0 0 0 0 164 164",
"subsystem": "block",
"uevent": "MAJOR=8\nMINOR=1\nDEVNAME=sda1\nDEVTYPE=partition"
}
},
"/dev/sda2": {
"DEVNAME": "/dev/sda2",
"DEVPATH": "/devices/pci0000:00/0000:00:1f.2/ata1/host0/target0:0:0/0:0:0:0/block/sda/sda2",
"DEVTYPE": "partition",
"MAJOR": "8",
"MINOR": "2",
"SUBSYSTEM": "block",
"attrs": {
"alignment_offset": "0",
"dev": "8:2",
"discard_alignment": "0",
"inflight": " 0 0",
"partition": "2",
"ro": "0",
"size": "26708279296",
"start": "7999488",
"stat": " 50380 3804 2602898 67292 6342 8616 1317944 297324 0 23584 364612",
"subsystem": "block",
"uevent": "MAJOR=8\nMINOR=2\nDEVNAME=sda2\nDEVTYPE=partition"
}
},
"/dev/sda3": {
"DEVNAME": "/dev/sda3",
"DEVPATH": "/devices/pci0000:00/0000:00:1f.2/ata1/host0/target0:0:0/0:0:0:0/block/sda/sda3",
"DEVTYPE": "partition",
"MAJOR": "8",
"MINOR": "3",
"SUBSYSTEM": "block",
"attrs": {
"alignment_offset": "0",
"dev": "8:3",
"discard_alignment": "0",
"inflight": " 0 0",
"partition": "3",
"ro": "0",
"size": "225256144896",
"start": "60164096",
"stat": " 147370 822 7488897 69040 76646 152167 5163719 221212 0 130124 290208",
"subsystem": "block",
"uevent": "MAJOR=8\nMINOR=3\nDEVNAME=sda3\nDEVTYPE=partition"
}
},
"/dev/sdf": {
"DEVNAME": "/dev/sdf",
"DEVPATH": "/devices/pci0000:00/0000:00:1f.2/ata2/host1/target1:0:0/1:0:0:0/block/sdf",
"DEVTYPE": "disk",
"MAJOR": "8",
"MINOR": "16",
"SUBSYSTEM": "block",
"attrs": {
"alignment_offset": "0",
"bdi": null,
"capability": "50",
"dev": "8:16",
"device": null,
"discard_alignment": "0",
"events": "",
"events_async": "",
"events_poll_msecs": "-1",
"ext_range": "256",
"inflight": " 0 0",
"range": "16",
"removable": "0",
"ro": "0",
"size": "2000398934016",
"stat": " 4430 73 278090 38788 35846 1471 3375701 50368 0 32324 89148",
"subsystem": "block",
"uevent": "MAJOR=8\nMINOR=16\nDEVNAME=sdf\nDEVTYPE=disk"
}
},
"/dev/sdf1": {
"DEVNAME": "/dev/sdf1",
"DEVPATH": "/devices/pci0000:00/0000:00:1f.2/ata2/host1/target1:0:0/1:0:0:0/block/sdf/sdf1",
"DEVTYPE": "partition",
"MAJOR": "8",
"MINOR": "17",
"SUBSYSTEM": "block",
"attrs": {
"alignment_offset": "0",
"dev": "8:17",
"discard_alignment": "0",
"inflight": " 0 0",
"partition": "1",
"ro": "0",
"size": "2000397885440",
"start": "2048",
"stat": " 4344 73 276522 38752 26196 1471 3375701 43504 0 25868 82248",
"subsystem": "block",
"uevent": "MAJOR=8\nMINOR=17\nDEVNAME=sdf1\nDEVTYPE=partition"
}
},
"/dev/sr0": {
"DEVNAME": "/dev/sr0",
"DEVPATH": "/devices/pci0000:00/0000:00:1f.2/ata3/host2/target2:0:0/2:0:0:0/block/sr0",
"DEVTYPE": "disk",
"MAJOR": "11",
"MINOR": "0",
"SUBSYSTEM": "block",
"attrs": {
"alignment_offset": "0",
"bdi": null,
"capability": "119",
"dev": "11:0",
"device": null,
"discard_alignment": "0",
"events": "media_change eject_request",
"events_async": "",
"events_poll_msecs": "2000",
"ext_range": "1",
"inflight": " 0 0",
"range": "1",
"removable": "1",
"ro": "0",
"size": "1073741312",
"stat": " 0 0 0 0 0 0 0 0 0 0 0",
"subsystem": "block",
"uevent": "MAJOR=11\nMINOR=0\nDEVNAME=sr0\nDEVTYPE=disk"
}
}
}
}

View File

@ -24,7 +24,7 @@ import subprocess
import yaml import yaml
from probert.network import UdevObserver from probert.network import NetworkEventReceiver
from subiquitycore.models import NetworkModel from subiquitycore.models import NetworkModel
from subiquitycore.ui.views import (NetworkView, from subiquitycore.ui.views import (NetworkView,
@ -141,9 +141,9 @@ class PythonSleep(BackgroundTask):
class WaitForDefaultRouteTask(BackgroundTask): class WaitForDefaultRouteTask(BackgroundTask):
def __init__(self, timeout, udev_observer): def __init__(self, timeout, event_receiver):
self.timeout = timeout self.timeout = timeout
self.udev_observer = udev_observer self.event_receiver = event_receiver
def __repr__(self): def __repr__(self):
return 'WaitForDefaultRouteTask(%r)'%(self.timeout,) return 'WaitForDefaultRouteTask(%r)'%(self.timeout,)
@ -154,7 +154,7 @@ class WaitForDefaultRouteTask(BackgroundTask):
def start(self): def start(self):
self.fail_r, self.fail_w = os.pipe() self.fail_r, self.fail_w = os.pipe()
self.success_r, self.success_w = os.pipe() self.success_r, self.success_w = os.pipe()
self.udev_observer.add_default_route_waiter(self.got_route) self.event_receiver.add_default_route_waiter(self.got_route)
def run(self): def run(self):
try: try:
@ -225,21 +225,12 @@ def sanitize_config(config):
ap_config['password'] = '<REDACTED>' ap_config['password'] = '<REDACTED>'
return config return config
class SubiquityObserver(UdevObserver): class SubiquityNetworkEventReceiver(NetworkEventReceiver):
def __init__(self, model, ui, loop): def __init__(self, model):
UdevObserver.__init__(self)
self.model = model self.model = model
self.ui = ui
self.loop = loop
self.default_route_waiter = None self.default_route_waiter = None
self.default_routes = set() self.default_routes = set()
def start(self):
fds = super().start()
for fd in fds:
self.loop.watch_file(fd, partial(self.data_ready, fd))
return fds
def new_link(self, ifindex, link): def new_link(self, ifindex, link):
self.model.new_link(ifindex, link) self.model.new_link(ifindex, link)
@ -272,20 +263,6 @@ class SubiquityObserver(UdevObserver):
else: else:
self.default_route_waiter = waiter self.default_route_waiter = waiter
def refresh(self):
v = self.ui.frame.body
if hasattr(v, 'refresh_model_inputs'):
v.refresh_model_inputs()
def data_ready(self, fd):
code = subprocess.call(['udevadm', 'settle', '-t', '0'])
if code != 0:
log.debug("waiting 0.1 to let udev event queue settle")
self.loop.set_alarm_in(0.1, lambda loop, ud:self.data_ready(fd))
return
super().data_ready(fd)
self.refresh()
default_netplan = ''' default_netplan = '''
network: network:
@ -335,11 +312,24 @@ class NetworkController(BaseController):
fp.write(default_netplan) fp.write(default_netplan)
self.model = NetworkModel(self.root) self.model = NetworkModel(self.root)
self.observer = SubiquityObserver(self.model, self.ui, self.loop) self.network_event_receiver = SubiquityNetworkEventReceiver(self.model)
self.observer.start() self.observer, fds = self.prober.probe_network(self.network_event_receiver)
for fd in fds:
self.loop.watch_file(fd, partial(self._data_ready, fd))
def _data_ready(self, fd):
code = subprocess.call(['udevadm', 'settle', '-t', '0'])
if code != 0:
log.debug("waiting 0.1 to let udev event queue settle")
self.loop.set_alarm_in(0.1, lambda loop, ud:self.data_ready(fd))
return
self.observer.data_ready(fd)
v = self.ui.frame.body
if hasattr(v, 'refresh_model_inputs'):
v.refresh_model_inputs()
def start_scan(self, dev): def start_scan(self, dev):
self.observer.wlan_listener.trigger_scan(dev.ifindex) self.observer.trigger_scan(dev.ifindex)
def cancel(self): def cancel(self):
self.signal.emit_signal('prev-screen') self.signal.emit_signal('prev-screen')
@ -391,14 +381,14 @@ class NetworkController(BaseController):
# least test that what we wrote is acceptable to netplan. # least test that what we wrote is acceptable to netplan.
tasks.append(('generate', BackgroundProcess(['netplan', 'generate', '--root', self.root]))) tasks.append(('generate', BackgroundProcess(['netplan', 'generate', '--root', self.root])))
if not self.tried_once: if not self.tried_once:
tasks.append(('timeout', WaitForDefaultRouteTask(3, self.observer))) tasks.append(('timeout', WaitForDefaultRouteTask(3, self.network_event_receiver)))
tasks.append(('fail', BackgroundProcess(['false']))) tasks.append(('fail', BackgroundProcess(['false'])))
self.tried_once = True self.tried_once = True
else: else:
tasks = [ tasks = [
('generate', BackgroundProcess(['/lib/netplan/generate'])), ('generate', BackgroundProcess(['/lib/netplan/generate'])),
('apply', BackgroundProcess(['netplan', 'apply'])), ('apply', BackgroundProcess(['netplan', 'apply'])),
('timeout', WaitForDefaultRouteTask(30, self.observer)), ('timeout', WaitForDefaultRouteTask(30, self.network_event_receiver)),
] ]
def cancel(): def cancel():

View File

@ -153,7 +153,7 @@ class Networkdev:
@property @property
def model(self): def model(self):
return self._net_info.vendor return self._net_info.model
@property @property
def is_connected(self): def is_connected(self):
@ -262,17 +262,17 @@ class Networkdev:
@property @property
def actual_ssid(self): def actual_ssid(self):
if self._net_info.ssid: if self._net_info.ssid:
return self._net_info.ssid.decode('utf-8', 'replace') return self._net_info.ssid
else: else:
return None return None
@property @property
def actual_ssids(self): def actual_ssids(self):
return [ssid.decode('utf-8', 'replace') for ssid in self._net_info.ssids] return self._net_info.wlan['visible_ssids']
@property @property
def scan_state(self): def scan_state(self):
return self._net_info.scan_state return self._net_info.wlan['scan_state']
@property @property
def configured_ssid(self): def configured_ssid(self):

View File

@ -16,6 +16,7 @@
import logging import logging
import yaml import yaml
import os import os
from probert.network import (StoredDataObserver, UdevObserver)
from probert.storage import (Storage, from probert.storage import (Storage,
StorageInfo) StorageInfo)
@ -30,15 +31,17 @@ class ProberException(Exception):
class Prober(): class Prober():
def __init__(self, opts): def __init__(self, opts):
self.opts = opts self.opts = opts
self.probe_data = {} self.probe_data = {}
self.saved_config = None
if self.opts.machine_config: if self.opts.machine_config:
log.debug('User specified machine_config: {}'.format( log.debug('User specified machine_config: {}'.format(
self.opts.machine_config)) self.opts.machine_config))
if os.path.exists(self.opts.machine_config): self.saved_config = \
self.probe_data = \
self._load_machine_config(self.opts.machine_config) self._load_machine_config(self.opts.machine_config)
log.debug('Prober() init finished, data:{}'.format(self.probe_data)) self.probe_data = self.saved_config
log.debug('Prober() init finished, data:{}'.format(self.saved_config))
def _load_machine_config(self, machine_config): def _load_machine_config(self, machine_config):
with open(machine_config) as mc: with open(machine_config) as mc:
@ -51,6 +54,14 @@ class Prober():
return data return data
def probe_network(self, receiver):
if self.opts.machine_config:
observer = StoredDataObserver(
self.saved_config['network'], receiver)
else:
observer = UdevObserver(receiver)
return observer, observer.start()
def get_storage(self): def get_storage(self):
''' Load a StorageInfo class. Probe if it's not present ''' ''' Load a StorageInfo class. Probe if it's not present '''
if 'storage' not in self.probe_data: if 'storage' not in self.probe_data: