From 2e9ebc0e64ef2febb61669a8fdec3e84dd4b0c63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roman=20Smr=C5=BE?= <roman.smrz@seznam.cz>
Date: Sun, 23 Apr 2023 20:22:28 +0200
Subject: Add network namespace in constructor of corresponding type

---
 src/Run.hs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/Run.hs')

diff --git a/src/Run.hs b/src/Run.hs
index f54a38c..67948d4 100644
--- a/src/Run.hs
+++ b/src/Run.hs
@@ -207,7 +207,7 @@ withNode netexpr tvname inner = do
 
 withDisconnectedUp :: HasNetns n => n -> TestRun a -> TestRun a
 withDisconnectedUp n inner = do
-    let netns = netnsName n
+    let netns = getNetns n
     disconnected <- asks $ S.member netns . tsDisconnectedUp . snd
     if disconnected
       then inner
@@ -220,7 +220,7 @@ withDisconnectedUp n inner = do
 
 withDisconnectedBridge :: HasNetns n => n -> TestRun a -> TestRun a
 withDisconnectedBridge n inner = do
-    let netns = netnsName n
+    let netns = getNetns n
     disconnected <- asks $ S.member netns . tsDisconnectedBridge . snd
     if disconnected
       then inner
@@ -233,14 +233,14 @@ withDisconnectedBridge n inner = do
 
 withNodePacketLoss :: Node -> Scientific -> TestRun a -> TestRun a
 withNodePacketLoss node loss inner = do
-    x <- local (fmap $ \s -> s { tsNodePacketLoss = M.insertWith (\l l' -> 1 - (1 - l) * (1 - l')) (netnsName node) loss $ tsNodePacketLoss s }) $ do
+    x <- local (fmap $ \s -> s { tsNodePacketLoss = M.insertWith (\l l' -> 1 - (1 - l) * (1 - l')) (getNetns node) loss $ tsNodePacketLoss s }) $ do
         resetLoss
         inner
     resetLoss
     return x
   where
     resetLoss = do
-        tl <- asks $ fromMaybe 0 . M.lookup (netnsName node) . tsNodePacketLoss . snd
+        tl <- asks $ fromMaybe 0 . M.lookup (getNetns node) . tsNodePacketLoss . snd
         liftIO $ callOn node $ "tc qdisc replace dev veth0 root netem loss " <> T.pack (show (tl * 100)) <> "%"
 
 
-- 
cgit v1.2.3