a little re-arrangement.

This commit is contained in:
lizhi-rocky
2010-07-30 17:36:54 +08:00
parent a88fd5b5ae
commit 53ba1ae4c1
6 changed files with 36 additions and 20 deletions

View File

@@ -120,10 +120,11 @@ p_node - xml node (parent node)'''
class Raid:
''' raid information '''
list = []
def __init__(self, raid_dev, raid_type, raw_devs):
def __init__(self, raid_dev, raid_type, raid_size, raw_devs):
''' Raid init function '''
self.raid_device = raid_dev
self.raid_type = raid_type
self.raid_size = raid_size
self.raw_devices = raw_devs
Raid.list.append(self)
@@ -149,7 +150,7 @@ class Raid:
raw_devs =[]
for ss in dev_res[3].split():
raw_devs.append(ss[:ss.index('[')])
Raid(raid_dev, raid_type, raw_devs)
Raid(raid_dev, raid_type, '-1', raw_devs)
@staticmethod
def init_from_xml(node):
@@ -158,11 +159,12 @@ class Raid:
if e.nodeType == e.ELEMENT_NODE and e.nodeName == 'raid':
raid_dev = e.attributes['raid-device'].value
raid_type = e.attributes['raid-type'].value
raid_size = e.attributes['raid-size'].value
raw_devs = []
for sub_e in e.childNodes:
if sub_e.nodeType == sub_e.ELEMENT_NODE and sub_e.nodeName == 'raw-device':
raw_devs.append(sub_e.firstChild.data.encode('ascii'))
Raid(raid_dev, raid_type, raw_devs)
Raid(raid_dev, raid_type, raid_size, raw_devs)
@staticmethod
def to_xml(doc, p_node):
@@ -181,6 +183,10 @@ p_node - xml node (parent node) '''
rd_type_attr.value = r.raid_type
rd.setAttributeNode(rd_type_attr)
rd_size_attr = doc.createAttribute('raid-size')
rd_size_attr.value = r.raid_size
rd.setAttributeNode(rd_size_attr)
for raw_dev in r.raw_devices:
raw_dev_e = doc.createElement('raw-device')
raw_dev_tn = doc.createTextNode(raw_dev)
@@ -190,7 +196,13 @@ p_node - xml node (parent node) '''
raids.appendChild(rd)
p_node.appendChild(raids)
@staticmethod
def get_size(dev):
for r in Raid.list:
if r.raid_device == dev:
return r.raid_size
class MountPoint:
''' mount-points '''
list=[]