Update ex201.2.end and 201.3.end to match slide instructions

docker · Sep 25, 2020 · d898284 · d898284
1 parent 993afa3
commit d898284
Showing 2 changed files with 13 additions and 18 deletions.
diff --git a/ex201/ex201.2.end/container_files/seed-data/bootstrap.gsh b/ex201/ex201.2.end/container_files/seed-data/bootstrap.gsh
@@ -10,24 +10,24 @@ addStem("app:vpn:service", "ref", "ref")
 addStem("app:vpn:service", "attributes", "attributes")
 
 addGroup("app:vpn:service:policy", "vpn_access", "vpn_access")
-addGroup("app:vpn:service:policy", "vpn_allow", "vpn_allow")
-addGroup("app:vpn:service:policy", "vpn_deny", "vpn_deny")
-addComposite("app:vpn:service:policy:vpn_access", CompositeType.COMPLEMENT, "app:vpn:service:policy:vpn_allow", "app:vpn:service:policy:vpn_deny")
+addGroup("app:vpn:service:policy", "vpn_access_allow", "vpn_access_allow")
+addGroup("app:vpn:service:policy", "vpn_access_deny", "vpn_access_deny")
+addComposite("app:vpn:service:policy:vpn_access", CompositeType.COMPLEMENT, "app:vpn:service:policy:vpn_access_allow", "app:vpn:service:policy:vpn_access_deny")
 
 addGroup("app:vpn:security", "vpnAdmins", "vpnAdmins")
 addGroup("app:vpn:security", "vpnReaders", "vpnReaders")
 addGroup("app:vpn:security", "vpnUpdaters", "vpnUpdaters")
 grantPriv("app:vpn", "app:vpn:security:vpnAdmins", NamingPrivilege.STEM)
 
-grantPriv("app:vpn:service:policy:vpn_allow", "app:vpn:security:vpnAdmins", AccessPrivilege.ADMIN)
-grantPriv("app:vpn:service:policy:vpn_allow", "app:vpn:security:vpnUpdaters", AccessPrivilege.UPDATE)
-grantPriv("app:vpn:service:policy:vpn_allow", "app:vpn:security:vpnReaders", AccessPrivilege.READ)
+grantPriv("app:vpn:service:policy:vpn_access_allow", "app:vpn:security:vpnAdmins", AccessPrivilege.ADMIN)
+grantPriv("app:vpn:service:policy:vpn_access_allow", "app:vpn:security:vpnUpdaters", AccessPrivilege.UPDATE)
+grantPriv("app:vpn:service:policy:vpn_access_allow", "app:vpn:security:vpnReaders", AccessPrivilege.READ)
 
 //ex 201.2.2
-addMember("app:vpn:service:policy:vpn_allow", "ref:employee:fac_staff")
-addMember("app:vpn:service:policy:vpn_deny", "ref:security:locked_by_ciso")
-addMember("app:vpn:service:policy:vpn_deny", "ref:iam:closure")
+addMember("app:vpn:service:policy:vpn_access_allow", "ref:employee:fac_staff")
+addMember("app:vpn:service:policy:vpn_access_deny", "ref:security:locked_by_ciso")
+addMember("app:vpn:service:policy:vpn_access_deny", "ref:iam:closure")
 
 //ex 201.2.3
-addMember("app:vpn:service:policy:vpn_allow", "org:irb:ref:irb_members")
+addMember("app:vpn:service:policy:vpn_access_allow", "org:irb:ref:irb_members")
 addMember("org:irb:ref:irb_members", "jsmith")
diff --git a/ex201/ex201.3.end/container_files/seed-data/bootstrap.gsh b/ex201/ex201.3.end/container_files/seed-data/bootstrap.gsh
@@ -8,21 +8,16 @@ addStem("app:eduPersonAffiliation", "service", "service");
 addStem("app:eduPersonAffiliation:service", "policy", "policy");
 addGroup("app:eduPersonAffiliation:service:policy", "ePA_student", "ePA_student");
 addGroup("app:eduPersonAffiliation:service:policy", "ePA_staff", "ePA_staff");
-addGroup("app:eduPersonAffiliation:service:policy", "ePA_alum", "ePA_alum");
-addGroup("app:eduPersonAffiliation:service:policy", "ePA_member", "ePA_member");
-addGroup("app:eduPersonAffiliation:service:policy", "ePA_affiliate", "ePA_affiliate");
-addGroup("app:eduPersonAffiliation:service:policy", "ePA_employee", "ePA_employee");
-addGroup("app:eduPersonAffiliation:service:policy", "ePA_library-walk-in", "ePA_library-walk-in");
+addGroup("app:eduPersonAffiliation:service:policy", "ePA_faculty", "ePA_faculty");
 
 //ex201.3.2
 addMember("app:eduPersonAffiliation:service:policy:ePA_student", "ref:student:students");
 
 //ex201.3.3
+addGroup("app:eduPersonAffiliation:service:policy", "ePA_member", "ePA_member");
 addMember("app:eduPersonAffiliation:service:policy:ePA_member", "app:eduPersonAffiliation:service:policy:ePA_student");
 addMember("app:eduPersonAffiliation:service:policy:ePA_member", "app:eduPersonAffiliation:service:policy:ePA_staff");
-addMember("app:eduPersonAffiliation:service:policy:ePA_member", "app:eduPersonAffiliation:service:policy:ePA_alum");
-addMember("app:eduPersonAffiliation:service:policy:ePA_member", "app:eduPersonAffiliation:service:policy:ePA_affiliate");
-addMember("app:eduPersonAffiliation:service:policy:ePA_member", "app:eduPersonAffiliation:service:policy:ePA_employee");
+addMember("app:eduPersonAffiliation:service:policy:ePA_member", "app:eduPersonAffiliation:service:policy:ePA_faculty");
 
 //ex201.3.4