Revision ccf17aa3
b/src/Ganeti/Rpc.hs | ||
---|---|---|
60 | 60 |
, RpcCallVersion(..) |
61 | 61 |
, RpcResultVersion(..) |
62 | 62 |
|
63 |
, StorageField(..) |
|
64 | 63 |
, RpcCallStorageList(..) |
65 | 64 |
, RpcResultStorageList(..) |
66 | 65 |
|
... | ... | |
414 | 413 |
|
415 | 414 |
-- ** StorageList |
416 | 415 |
|
417 |
-- | StorageList |
|
418 |
|
|
419 |
-- FIXME: This may be moved to Objects |
|
420 |
$(declareSADT "StorageField" |
|
421 |
[ ( "SFUsed", 'C.sfUsed) |
|
422 |
, ( "SFName", 'C.sfName) |
|
423 |
, ( "SFAllocatable", 'C.sfAllocatable) |
|
424 |
, ( "SFFree", 'C.sfFree) |
|
425 |
, ( "SFSize", 'C.sfSize) |
|
426 |
]) |
|
427 |
$(makeJSONInstance ''StorageField) |
|
428 |
|
|
429 | 416 |
$(buildObject "RpcCallStorageList" "rpcCallStorageList" |
430 | 417 |
[ simpleField "su_name" [t| StorageType |] |
431 | 418 |
, simpleField "su_args" [t| [String] |] |
b/src/Ganeti/Types.hs | ||
---|---|---|
139 | 139 |
, AdminState(..) |
140 | 140 |
, adminStateFromRaw |
141 | 141 |
, adminStateToRaw |
142 |
, StorageField(..) |
|
143 |
, storageFieldToRaw |
|
142 | 144 |
) where |
143 | 145 |
|
144 | 146 |
import Control.Monad (liftM) |
... | ... | |
745 | 747 |
, ("AdminUp", "up") |
746 | 748 |
]) |
747 | 749 |
$(THH.makeJSONInstance ''AdminState) |
750 |
|
|
751 |
-- * Storage field type |
|
752 |
|
|
753 |
$(THH.declareLADT ''String "StorageField" |
|
754 |
[ ( "SFUsed", "used") |
|
755 |
, ( "SFName", "name") |
|
756 |
, ( "SFAllocatable", "allocatable") |
|
757 |
, ( "SFFree", "free") |
|
758 |
, ( "SFSize", "size") |
|
759 |
]) |
|
760 |
$(THH.makeJSONInstance ''StorageField) |
Also available in: Unified diff