+list LGTM, thanks.
Thomas On Mon, Sep 30, 2013 at 2:21 PM, Santi Raffa <[email protected]> wrote: > On Mon, Sep 30, 2013 at 1:55 PM, Thomas Thrainer <[email protected]> > wrote: > > dt usually stands for disk template, which is not at all the case here. > > What's about diskAccessUserspace, diskAccessKernelspace and > > validDiskAccessModes? > > Whoops. I thought the remark about disk_ was for all the constants > introduced, not just that line. > > So, scrap the previous interdiff. Here's what's left: > > diff --git a/lib/constants.py b/lib/constants.py > index 6458bd4..947f5c0 100644 > --- a/lib/constants.py > +++ b/lib/constants.py > @@ -521,8 +521,7 @@ DISK_RDWR = _constants.DISK_RDWR > DISK_ACCESS_SET = _constants.DISK_ACCESS_SET > DISK_USERSPACE = _constants.DISK_USERSPACE > DISK_KERNELSPACE = _constants.DISK_KERNELSPACE > -DISK_VALID_ACCESS_PROTOCOLS = _constants.DISK_VALID_ACCESS_PROTOCOLS > -DISK_VALID_ACCESS_COMBINATIONS = _constants.DISK_VALID_ACCESS_COMBINATIONS > +DISK_VALID_ACCESS_MODES = _constants.DISK_VALID_ACCESS_MODES > > # disk replacement mode > REPLACE_DISK_PRI = "replace_on_primary" # replace disks on primary > diff --git a/src/Ganeti/HsConstants.hs b/src/Ganeti/HsConstants.hs > index eee7573..6826408 100644 > --- a/src/Ganeti/HsConstants.hs > +++ b/src/Ganeti/HsConstants.hs > @@ -1382,25 +1382,14 @@ statFile = "/proc/stat" > mondTimeInterval :: Int > mondTimeInterval = 5 > > --- * Disk access protocols > +-- * Disk access modes > > diskUserspace :: String > -diskUserspace = Types.diskAccessProtocolToRaw DiskUserspace > +diskUserspace = Types.diskAccessModeToRaw DiskUserspace > > diskKernelspace :: String > -diskKernelspace = Types.diskAccessProtocolToRaw DiskKernelspace > - > -diskValidAccessProtocols :: FrozenSet String > -diskValidAccessProtocols = > - ConstantUtils.mkSet $ map Types.diskAccessProtocolToRaw [minBound..] > - > --- Hypervisor / Template / Access > -diskValidAccessCombinations :: FrozenSet (Hypervisor, > - DiskTemplate, > - DiskAccessProtocol) > -diskValidAccessCombinations = > - ConstantUtils.mkSet [ (hv, disk, proto) | > - hv <- [minBound..], > - disk <- [minBound..], > - proto <- [minBound..], > - isValidAccessCombination hv disk proto ] > +diskKernelspace = Types.diskAccessModeToRaw DiskKernelspace > + > +diskValidAccessModes :: FrozenSet String > +diskValidAccessModes = > + ConstantUtils.mkSet $ map Types.diskAccessModeToRaw [minBound..] > diff --git a/src/Ganeti/Types.hs b/src/Ganeti/Types.hs > index c2b8602..d208b6d 100644 > --- a/src/Ganeti/Types.hs > +++ b/src/Ganeti/Types.hs > @@ -141,9 +141,8 @@ module Ganeti.Types > , adminStateToRaw > , StorageField(..) > , storageFieldToRaw > - , DiskAccessProtocol(..) > - , diskAccessProtocolToRaw > - , isValidAccessCombination > + , DiskAccessMode(..) > + , diskAccessModeToRaw > ) where > > import Control.Monad (liftM) > @@ -770,17 +769,8 @@ $(THH.makeJSONInstance ''StorageField) > > -- * Disk access protocol > > -$(THH.declareLADT ''String "DiskAccessProtocol" > +$(THH.declareLADT ''String "DiskAccessMode" > [ ( "DiskUserspace", "userspace") > , ( "DiskKernelspace", "kernelspace") > ]) > -$(THH.makeJSONInstance ''DiskAccessProtocol) > - > -instance THH.PyValue DiskAccessProtocol where > - showValue = show . diskAccessProtocolToRaw > - > -isValidAccessCombination :: Hypervisor -> DiskTemplate -> > - DiskAccessProtocol -> Bool > -isValidAccessCombination _ _ DiskKernelspace = True > -isValidAccessCombination Kvm DTRbd DiskUserspace = True > -isValidAccessCombination _ _ _ = False > +$(THH.makeJSONInstance ''DiskAccessMode) > > -- > Raffa Santi > Google Germany GmbH > Dienerstr. 12 > 80331 München > > > Registergericht und -nummer: Hamburg, HRB 86891 > Sitz der Gesellschaft: Hamburg > Geschäftsführer: Graham Law, Christine Elizabeth Flores > -- Thomas Thrainer | Software Engineer | [email protected] | Google Germany GmbH Dienerstr. 12 80331 München Registergericht und -nummer: Hamburg, HRB 86891 Sitz der Gesellschaft: Hamburg Geschäftsführer: Graham Law, Christine Elizabeth Flores
