generalised image, ensured no warnings

WhereSoftwareGoesToDie · Feb 10, 2015 · 6bfd7db · 6bfd7db
1 parent 4ff2d1a
commit 6bfd7db
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 18 deletions.
diff --git a/lib/Ceilometer/Fold.hs b/lib/Ceilometer/Fold.hs
@@ -93,7 +93,7 @@ foldSSD window = PFold step bEvent (eEvent window)
 foldImage :: Window -> PFold (Timed PDImage) (FoldResult PDImage)
 foldImage window = PFold step bEvent (eEvent window)
   where -- Stop folding as soon as the image is deleted
-        step (More (prev,acc)) (Timed end (PDImage _ ImageDelete _))
+        step (More (prev,acc)) (Timed end (PDImage _ ImageDelete _ _))
           = Term (Nothing, go end acc prev)
         step a x = sEvent window a x
 

diff --git a/lib/Ceilometer/Types.hs b/lib/Ceilometer/Types.hs
@@ -128,7 +128,7 @@ instance Valued PDInstanceDisk   where
 
 instance Valued PDImage          where
   type PFValue PDImage           = PFValue32
-  value f (PDImage s v x)        = PDImage s v <$> f x
+  value f (PDImage s v e x)      = PDImage s v e <$> f x
 
 instance Valued PDImagePollster  where
   type PFValue PDImagePollster   = PFValue64

diff --git a/lib/Ceilometer/Types/Image.hs b/lib/Ceilometer/Types/Image.hs
@@ -53,9 +53,10 @@ $(declarePF    "Image"
             [ ''Show, ''Read, ''Eq, ''Bounded, ''Enum ])
 
 data PDImage = PDImage
-  { _imageStatus :: PFImageStatus
-  , _imageVerb   :: PFImageVerb
-  , _imageVal    :: PFValue32 }
+  { _imageStatus   :: PFImageStatus
+  , _imageVerb     :: PFImageVerb
+  , _imageEndpoint :: PFEndpoint
+  , _imageVal      :: PFValue32 }
   deriving (Eq, Show, Read, Typeable)
 
 $(makeLenses ''PDImage)
@@ -68,15 +69,15 @@ pdImagePollster = iso (PDImagePollster . _prSimpleVal) (PRSimple . _pdImagePolls
 
 pdImage :: Prism' PRCompoundEvent PDImage
 pdImage = prism' pretty parse
-  where parse raw = do
-          s <- raw ^? eventStatus   . pfImageStatus
-          v <- raw ^? eventVerb     . pfImageVerb
-          _ <- raw ^? eventEndpoint . pfEndpoint . only Instant
-          x <- raw ^? eventVal
-          Just $ PDImage s v x
-        pretty (PDImage status verb val)
+  where parse raw
+          =   PDImage
+          <$> (raw ^? eventStatus   . pfImageStatus)
+          <*> (raw ^? eventVerb     . pfImageVerb)
+          <*> (raw ^? eventEndpoint . pfEndpoint)
+          <*> (raw ^? eventVal )
+        pretty (PDImage status verb ep val)
           = PRCompoundEvent
             val
-            (Instant ^. re pfEndpoint)
-            (verb    ^. re pfImageVerb)
-            (status  ^. re pfImageStatus)
+            (ep     ^. re pfEndpoint)
+            (verb   ^. re pfImageVerb)
+            (status ^. re pfImageStatus)
diff --git a/tests/SampleData.hs b/tests/SampleData.hs
@@ -104,6 +104,7 @@ instance Arbitrary PDImage          where arbitrary =   PDImage
                                                   <$> arbitrary
                                                   <*> arbitrary
                                                   <*> arbitrary
+                                                  <*> arbitrary
 instance Arbitrary PDImagePollster  where arbitrary =   PDImagePollster <$> arbitrary
 instance Arbitrary PDSnapshot       where arbitrary =   PDSnapshot
                                                   <$> arbitrary
@@ -279,9 +280,9 @@ imagePR2 = 3 + (5 `shift` 8) + (0 `shift` 16) + (100000 `shift` 32)
 imagePDs = [imagePD0, imagePD1, imagePD2 ]
 
 imagePD0, imagePD1, imagePD2 :: PDImage
-imagePD0 = PDImage ImageActive  ImageUpload 200000
-imagePD1 = PDImage ImageActive  ImageServe  400000
-imagePD2 = PDImage ImageDeleted ImageDelete 100000
+imagePD0 = PDImage ImageActive  ImageUpload Instant 200000
+imagePD1 = PDImage ImageActive  ImageServe  Instant 400000
+imagePD2 = PDImage ImageDeleted ImageDelete Instant 100000
 
 imageTimedPDs :: [Timed PDImage]
 imageTimedPDs = [ Timed testS        imagePD0