From d17407611d099da1b6e91ac2ca0192f9473e5e29 Mon Sep 17 00:00:00 2001
From: TheJoKlLa <thejoklla@gmail.com>
Date: Wed, 15 Jun 2022 21:53:12 +0000
Subject: [PATCH] Update bffh.dhall

---
 config/bffh/bffh.dhall | 208 ++++++-----------------------------------
 1 file changed, 27 insertions(+), 181 deletions(-)

diff --git a/config/bffh/bffh.dhall b/config/bffh/bffh.dhall
index 503b93c..21a0428 100644
--- a/config/bffh/bffh.dhall
+++ b/config/bffh/bffh.dhall
@@ -58,18 +58,10 @@
         Admin = {
             permissions =  [
                 "TestEnv.Admin",
-                "TestEnv.Manage.A",
-                "TestEnv.Manage.B",
-                "TestEnv.Manage.C",
-                "TestEnv.Write.A",
-                "TestEnv.Write.B",
-                "TestEnv.Write.C",
-                "TestEnv.Read.A",
-                "TestEnv.Read.B",
-                "TestEnv.Read.C",
-                "TestEnv.Disclose.A",
-                "TestEnv.Disclose.B",
-                "TestEnv.Disclose.C"
+                "TestEnv.Manage",
+                "TestEnv.Write",
+                "TestEnv.Read",
+                "TestEnv.Disclose",
             ]
         },
 
@@ -81,45 +73,21 @@
             ]
         },
 
-        ManageA = {
-            permissions = [ "TestEnv.Manage.A" ]
-        },
-        ManageB = {
-            permissions = [ "TestEnv.Manage.B" ]
-        },
-        ManageC = {
-            permissions = [ "TestEnv.Manage.C" ]
+        Manage = {
+            permissions = [ "TestEnv.Manage" ]
         },
 
-        UseA = {
-            permissions = [ "TestEnv.Write.A" ]
-        },
-        UseB = {
-            permissions = [ "TestEnv.Write.B" ]
-        },
-        UseC = {
-            permissions = [ "TestEnv.Write.C" ]
+        Use = {
+            permissions = [ "TestEnv.Write" ]
         },
 
-        ReadA = {
-            permissions = [ "TestEnv.Read.A" ]
+        Read = {
+            permissions = [ "TestEnv.Read" ]
         },
-        ReadB = {
-            permissions = [ "TestEnv.Read.B" ]
+        
+        Disclose = {
+            permissions = [ "TestEnv.Disclose" ]
         },
-        ReadC = {
-            permissions = [ "TestEnv.Read.C" ]
-        },
-
-        DiscloseA = {
-            permissions = [ "TestEnv.Disclose.A" ]
-        },
-        DiscloseB = {
-            permissions = [ "TestEnv.Disclose.B" ]
-        },
-        DiscloseC = {
-            permissions = [ "TestEnv.Disclose.C" ]
-        }
     },
 
     machines = {
@@ -156,145 +124,23 @@
             write = "TestEnv.Write.A",
             manage = "TestEnv.Manage.A"
         },
-        MachineA4 = {
-            name = "MachineA4",
-            description = "Description of MachineA4",
-            wiki = "https://fab-access.readthedocs.io",
-            category = "CategoryA",
-            
-            disclose = "TestEnv.Disclose.A",
-            read = "TestEnv.Read.A",
-            write = "TestEnv.Write.A",
-            manage = "TestEnv.Manage.A"
-        },
-        MachineA5 = {
-            name = "MachineA5",
-            description = "Description of MachineA5",
-            wiki = "https://fab-access.readthedocs.io",
-            category = "CategoryA",
-            
-            disclose = "TestEnv.Disclose.A",
-            read = "TestEnv.Read.A",
-            write = "TestEnv.Write.A",
-            manage = "TestEnv.Manage.A"
-        },
-
-        MachineB1 = {
-            name = "MachineB1",
-            description = "Description of MachineB1",
-            wiki = "https://fab-access.readthedocs.io",
-            category = "CategoryB",
-            
-            disclose = "TestEnv.Disclose.B",
-            read = "TestEnv.Read.B",
-            write = "TestEnv.Write.B",
-            manage = "TestEnv.Manage.B"
-        },
-        MachineB2 = {
-            name = "MachineB2",
-            description = "Description of MachineB2",
-            wiki = "https://fab-access.readthedocs.io",
-            category = "CategoryB",
-            
-            disclose = "TestEnv.Disclose.B",
-            read = "TestEnv.Read.B",
-            write = "TestEnv.Write.B",
-            manage = "TestEnv.Manage.B"
-        },
-        MachineB3 = {
-            name = "MachineB3",
-            description = "Description of MachineB3",
-            wiki = "https://fab-access.readthedocs.io",
-            category = "CategoryB",
-            
-            disclose = "TestEnv.Disclose.B",
-            read = "TestEnv.Read.B",
-            write = "TestEnv.Write.B",
-            manage = "TestEnv.Manage.B"
-        },
-        MachineB4 = {
-            name = "MachineB4",
-            description = "Description of MachineB4",
-            wiki = "https://fab-access.readthedocs.io",
-            category = "CategoryB",
-            
-            disclose = "TestEnv.Disclose.B",
-            read = "TestEnv.Read.B",
-            write = "TestEnv.Write.B",
-            manage = "TestEnv.Manage.B"
-        },
-        MachineB5 = {
-            name = "MachineB5",
-            description = "Description of MachineB5",
-            wiki = "https://fab-access.readthedocs.io",
-            category = "CategoryB",
-            
-            disclose = "TestEnv.Disclose.B",
-            read = "TestEnv.Read.B",
-            write = "TestEnv.Write.B",
-            manage = "TestEnv.Manage.B"
-        },
-
-        MachineC1 = {
-            name = "MachineC1",
-            description = "Description of MachineC1",
-            wiki = "https://fab-access.readthedocs.io",
-            category = "CategoryC",
-            
-            disclose = "TestEnv.Disclose.C",
-            read = "TestEnv.Read.C",
-            write = "TestEnv.Write.C",
-            manage = "TestEnv.Manage.C"
-        },
-        MachineC2 = {
-            name = "MachineC2",
-            description = "Description of MachineC2",
-            wiki = "https://fab-access.readthedocs.io",
-            category = "CategoryC",
-            
-            disclose = "TestEnv.Disclose.C",
-            read = "TestEnv.Read.C",
-            write = "TestEnv.Write.C",
-            manage = "TestEnv.Manage.C"
-        },
-        MachineC3 = {
-            name = "MachineC3",
-            description = "Description of MachineC3",
-            wiki = "https://fab-access.readthedocs.io",
-            category = "CategoryC",
-            
-            disclose = "TestEnv.Disclose.C",
-            read = "TestEnv.Read.C",
-            write = "TestEnv.Write.C",
-            manage = "TestEnv.Manage.C"
-        },
-        MachineC4 = {
-            name = "MachineC4",
-            description = "Description of MachineC4",
-            wiki = "https://fab-access.readthedocs.io",
-            category = "CategoryC",
-            
-            disclose = "TestEnv.Disclose.C",
-            read = "TestEnv.Read.C",
-            write = "TestEnv.Write.C",
-            manage = "TestEnv.Manage.C"
-        },
-        MachineC5 = {
-            name = "MachineC5",
-            description = "Description of MachineC5",
-            wiki = "https://fab-access.readthedocs.io",
-            category = "CategoryC",
-            
-            disclose = "TestEnv.Disclose.C",
-            read = "TestEnv.Read.C",
-            write = "TestEnv.Write.C",
-            manage = "TestEnv.Manage.C"
-        },
     },
     
-    actors = {=},
+    actors = {
+        -- Actors similarly to machines have an 'id'. This id (here "Shelly1234") is limited to Alphanumeric ASCII
+        -- and must begin with a letter.
+        shellyplug-s-AAAAAA = { module = "Shelly", params = {=} },
+        shellyplug-s-AAAAAA = { module = "Shelly", params = {=} },
+        shellyplug-s-AAAAAA = { module = "Shelly", params = {=} },
+        shelly1-AAAAAAAAAAAA = { module = "Shelly", params = {=} },
+        shelly1-AAAAAAAAAAAA = { module = "Shelly", params = {=} },
+    },
 
-    actor_connections = [] : List { machine : Text, actor : Text },
+    actor_connections = [
+        { machine = "MachineA1", actor = "shellyplug-s-AAAAAA" },
+        { machine = "MachineA2", actor = "shellyplug-s-AAAAAA" },
+        { machine = "MachineA3", actor = "shellyplug-s-AAAAAA" },
+    ],
 
     initiators = {=},