Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Replacing Project.Educational with Slice.OnlyEDUKY #8

Merged
merged 2 commits into from
Nov 8, 2023
Merged

Replacing Project.Educational with Slice.OnlyEDUKY #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ed509b5
Replacing Project.Educational with Slice.OnlyEDUKY
Nov 6, 2023
772e776
Removed combining OnlyEDUKY with Slice.Multisite - these two tags no …
Nov 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions policies/alfa/FabricOrchestratorProjectTags/orchestrator-project-tags.alfa
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,10 +188,10 @@ namespace fabricTags {

rule eduSite {
deny
condition not(Attributes.resourceSite == "EDUKY") && Attributes.projectTag == "Project.Educational" && not(Attributes.projectTag == "Slice.Multisite")
condition not(Attributes.resourceSite == "EDUKY") && Attributes.projectTag == "Slice.OnlyEDUKY"
on deny {
advice reasonToDeny {
Attributes.message = "Policy Violation: Your project is tagged as Educational and lacks Slice.Multisite tag and cannot use resources on sites other than EDUKY."
Attributes.message = "Policy Violation: Your project is tagged as OnlyEDUKY and cannot use resources on sites other than EDUKY."
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src-gen/fabricTags.OrchestratorTags.xml
View file
Open in desktop

Large diffs are not rendered by default.

49 changes: 6 additions & 43 deletions test/test-harness.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -690,7 +690,7 @@ def testFacilityFail(self) -> None:
def testEducationalOK(self) -> None:

"""
Test that adding using EDUKY with Project.Educational is OK
Test that adding using EDUKY with Slice.OnlyEDUKY is OK
"""
t = fu.ExperimentTopology()
n1 = t.add_node(name='n1', site='EDUKY', capacities=fu.Capacities(core=1, ram=10, disk=25))
Expand All @@ -717,7 +717,7 @@ def testEducationalOK(self) -> None:
authz.set_subject_attributes(subject_id='user@google.com', project='MyProject', project_tag=[
'VM.NoLimit',
'Component.SmartNIC', 'Net.FABNetv6Ext',
'Project.Educational'
'Slice.OnlyEDUKY'
])
authz.set_resource_subject_and_project(subject_id='user@google.com', project='MyProject')

Expand All @@ -727,13 +727,13 @@ def testEducationalOK(self) -> None:
def testEducationalFail(self) -> None:

"""
Test that adding using non-UKY with Project.Educational fails
Test that adding using non-EDUUKY with Slice.EDUKY fails
"""
t = fu.ExperimentTopology()
n1 = t.add_node(name='n1', site='RENC', capacities=fu.Capacities(core=1, ram=10, disk=25))
n1 = t.add_node(name='n1', site='WASH', capacities=fu.Capacities(core=1, ram=10, disk=25))
c1 = n1.add_component(name='c1', model_type=fu.ComponentModelType.SmartNIC_ConnectX_6)
c2 = n1.add_component(name='c2', model_type=fu.ComponentModelType.SharedNIC_ConnectX_6)
n2 = t.add_node(name='n2', site='RENC', capacities=fu.Capacities(core=10, ram=10, disk=35))
n2 = t.add_node(name='n2', site='EDUKY', capacities=fu.Capacities(core=10, ram=10, disk=35))
c4 = n2.add_component(name='c4', model_type=fu.ComponentModelType.SmartNIC_ConnectX_5)
s1 = t.add_network_service(name='s1', nstype=fu.ServiceType.FABNetv6Ext,
interfaces=[c1.interface_list[0]])
Expand All @@ -754,46 +754,9 @@ def testEducationalFail(self) -> None:
authz.set_subject_attributes(subject_id='user@google.com', project='MyProject', project_tag=[
'VM.NoLimit',
'Component.SmartNIC', 'Net.FABNetv6Ext',
'Project.Educational'
'Slice.OnlyEDUKY'
])
authz.set_resource_subject_and_project(subject_id='user@google.com', project='MyProject')

print(f"EducationalFail: {authz.transform_to_pdp_request()}")
self.runOnStringRequest(authz.transform_to_pdp_request(), TAGPDP, 'Deny')

def testEducationalMultisiteOK(self) -> None:

"""
Test that adding using non-UKY with Project.Educational and Slice.Multisite is OK
"""
t = fu.ExperimentTopology()
n1 = t.add_node(name='n1', site='RENC', capacities=fu.Capacities(core=1, ram=10, disk=25))
c1 = n1.add_component(name='c1', model_type=fu.ComponentModelType.SmartNIC_ConnectX_6)
c2 = n1.add_component(name='c2', model_type=fu.ComponentModelType.SharedNIC_ConnectX_6)
n2 = t.add_node(name='n2', site='UKY', capacities=fu.Capacities(core=10, ram=10, disk=35))
c4 = n2.add_component(name='c4', model_type=fu.ComponentModelType.SmartNIC_ConnectX_5)
s1 = t.add_network_service(name='s1', nstype=fu.ServiceType.FABNetv6Ext,
interfaces=[c1.interface_list[0]])
s2 = t.add_network_service(name='s2', nstype=fu.ServiceType.FABNetv6Ext,
interfaces=[c4.interface_list[0]])

t.validate()

authz = ResourceAuthZAttributes()

now = datetime.datetime.now(datetime.timezone.utc)
delta = datetime.timedelta(days=13, hours=11, minutes=7, seconds=4, milliseconds=10)
future = now + delta

authz.collect_resource_attributes(source=t)
authz.set_action('create')
authz.set_lifetime(future)
authz.set_subject_attributes(subject_id='user@google.com', project='MyProject', project_tag=[
'VM.NoLimit',
'Component.SmartNIC', 'Net.FABNetv6Ext',
'Project.Educational', 'Slice.Multisite'
])
authz.set_resource_subject_and_project(subject_id='user@google.com', project='MyProject')

print(f"EducationalMultisiteOK: {authz.transform_to_pdp_request()}")
self.runOnStringRequest(authz.transform_to_pdp_request(), TAGPDP)