WIP

bench/cardano-profile/src/Cardano/Benchmarking/Profile.hs

@@ -64,7 +64,7 @@ module Cardano.Benchmarking.Profile (
   -- Cluster params.
   , clusterMinimunStorage, clusterKeepRunningOn
   , nomadNamespace, nomadClass, nomadResources, nomadSSHLogsOn
-  , awsInstanceTypes
+  , awsInstanceTypes, usePublicRouting
 
   -- Analysis params.
   , analysisOff, analysisStandard, analysisPerformance
@@ -170,13 +170,15 @@ empty = Types.Profile {
           Types.producer = Types.Resources 0 0 0
         , Types.explorer = Just $ Types.Resources 0 0 0
         }
+      , Types.host_volumes = Nothing
       , Types.fetch_logs_ssh = False
       }
     , Types.aws = Types.ClusterAWS {
         Types.instance_type = Types.ByNodeType {
           Types.producer = ""
         , Types.explorer = Nothing
         }
+      , Types.use_public_routing = False
       }
     , Types.minimun_storage = Just $ Types.ByNodeType {
         Types.producer = 0
@@ -227,6 +229,7 @@ empty = Types.Profile {
     , Types.createTestnetDataArgs = []
     , Types.pools = []
   }
+  , Types.overlay = mempty
 }
 
 --------------------------------------------------------------------------------
@@ -516,6 +519,9 @@ aws f p = cluster (\c -> c {Types.aws = f (Types.aws c)}) p
 awsInstanceTypes :: (Types.ByNodeType String) -> Types.Profile -> Types.Profile
 awsInstanceTypes i = aws (\n -> n {Types.instance_type = i})
 
+usePublicRouting :: Types.Profile -> Types.Profile
+usePublicRouting = aws (\n -> n {Types.use_public_routing = True})
+
 -- Analysis.
 --------------------------------------------------------------------------------
 
@@ -622,7 +628,7 @@ unionWithKey _ (Aeson.Object a) (Aeson.Object b) =
 unionWithKey _ _ b = b
 
 derive :: Types.Profile -> Types.Profile
-derive p@(Types.Profile _ _ _ comp _era gsis n gtor _ _ ana _ _) =
+derive p@(Types.Profile _ _ _ comp _era gsis n gtor _ _ ana _ _ _) =
   let 
       -- Absolute/epoch durations:
       ----------------------------
@@ -805,7 +811,7 @@ derive p@(Types.Profile _ _ _ comp _era gsis n gtor _ _ ana _ _) =
 --}
 
 cliArgs :: Types.Profile -> Types.Profile
-cliArgs p@(Types.Profile _ _ _ comp __ gsis _ _ _ _ _ dved _) =
+cliArgs p@(Types.Profile _ _ _ comp __ gsis _ _ _ _ _ dved _ _) =
   let --toJson = map (\(k,n) -> )
       fmtDecimal i =
            (Scientific.formatScientific Scientific.Fixed (Just 0) ((fromInteger i) / 100000))

bench/cardano-profile/src/Cardano/Benchmarking/Profile/Map.hs

@@ -652,6 +652,8 @@ nomadPerf =
   , Types.explorer = Just "m5.4xlarge"
   })
   .
+  P.usePublicRouting
+  .
   P.clusterMinimunStorage (Just $ Types.ByNodeType {
     Types.producer = 12582912
   , Types.explorer = Just 14155776
@@ -686,6 +688,8 @@ clusterNomadSsd =
   , Types.explorer = Just "r5d.4xlarge"
   })
   .
+  P.usePublicRouting
+  .
   P.clusterMinimunStorage Nothing
 
 clusterDefault :: Types.Profile -> Types.Profile
@@ -699,13 +703,15 @@ clusterDefault p =
           Types.producer = Types.Resources 2 15000 16000
         , Types.explorer = Just $ Types.Resources 2 15000 16000
         }
+      , Types.host_volumes = Nothing
       , Types.fetch_logs_ssh = False
       }
     , Types.aws = Types.ClusterAWS {
         Types.instance_type = Types.ByNodeType {
           Types.producer = "c5.2xlarge"
         , Types.explorer = Just "m5.4xlarge"
         }
+      , Types.use_public_routing = False
       }
     , Types.minimun_storage = Just $ Types.ByNodeType {
         Types.producer = 12582912

bench/cardano-profile/src/Cardano/Benchmarking/Profile/Types.hs

@@ -51,10 +51,10 @@ data Profile = Profile
   , tracer :: Tracer
   , cluster :: Cluster
   , analysis :: Analysis
-  -- TODO
---  , overlay :: Aeson.Object
   , derived :: Derived
   , cli_args :: CliArgs
+  -- TODO
+  , overlay :: Aeson.Object
   }
   deriving (Eq, Show, Generic)
 
@@ -399,16 +399,18 @@ data ClusterNomad = ClusterNomad
   { namespace :: String
   , nomad_class :: String
   , resources :: ByNodeType Resources
+  , host_volumes :: Maybe [Aeson.Object]
   , fetch_logs_ssh :: Bool
   }
   deriving (Eq, Show, Generic)
 
 instance Aeson.ToJSON ClusterNomad where
-  toJSON p@(ClusterNomad _ _ _ _) =
+  toJSON p@(ClusterNomad _ _ _ _ _) =
     Aeson.object
       [ "namespace"      Aeson..= namespace p
       , "class"          Aeson..= nomad_class p
       , "resources"      Aeson..= resources p
+      , "host_volumes"   Aeson..= host_volumes p
       , "fetch_logs_ssh" Aeson..= fetch_logs_ssh p
       ]
 
@@ -419,10 +421,12 @@ instance Aeson.FromJSON ClusterNomad where
         <$> o Aeson..: "namespace"
         <*> o Aeson..: "class"
         <*> o Aeson..: "resources"
+        <*> o Aeson..: "host_volumes"
         <*> o Aeson..: "fetch_logs_ssh"
 
 data ClusterAWS = ClusterAWS
   { instance_type :: ByNodeType String
+  , use_public_routing :: Bool
   }
   deriving (Eq, Show, Generic)
 

bench/cardano-profile/test/Main.hs

@@ -162,13 +162,15 @@ ciTestBage = Types.Profile {
           Types.producer = Types.Resources 2 15000 16000
         , Types.explorer = Just $ Types.Resources 2 15000 16000
         }
+      , Types.host_volumes = Nothing
       , Types.fetch_logs_ssh = False
       }
     , Types.aws = Types.ClusterAWS {
         Types.instance_type = Types.ByNodeType {
           Types.producer = "c5.2xlarge"
         , Types.explorer = Just "m5.4xlarge"
         }
+      , Types.use_public_routing = False
       }
     , Types.minimun_storage = Just $ Types.ByNodeType {
         Types.producer = 12582912
@@ -244,6 +246,7 @@ ciTestBage = Types.Profile {
         , Aeson.String "initialPoolCoin", Aeson.String "1000000000000000"
       ]
   }
+  , Types.overlay = mempty
 }
 
 profilesMap :: Tasty.TestTree