From c01b5cf85cab5f5bc4978fca7ffc222bd56e2b03 Mon Sep 17 00:00:00 2001 From: CalvinSpolwindAlmato Date: Tue, 16 Dec 2025 10:49:07 +0100 Subject: [PATCH 1/4] FIx intedation --- NTO/MARS/entities/Resource.ttl | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/NTO/MARS/entities/Resource.ttl b/NTO/MARS/entities/Resource.ttl index 3857b8bcdc..c78eb2c51c 100644 --- a/NTO/MARS/entities/Resource.ttl +++ b/NTO/MARS/entities/Resource.ttl @@ -29,25 +29,25 @@ ogit.MARS:Resource ogit:parent ogit:Node; ogit:mandatory-attributes ( ogit:name - ogit.MARS.Resource:class + ogit.MARS.Resource:class ); ogit:optional-attributes ( - ogit:url + ogit:url - ogit.Automation:automationState - ogit.Automation:lifecycle - ogit.Automation:serviceStatus - ogit.Automation:marsNodeType + ogit.Automation:automationState + ogit.Automation:lifecycle + ogit.Automation:serviceStatus + ogit.Automation:marsNodeType - ogit:tenantId + ogit:tenantId ); - ogit:indexed-attributes ( - ogit:name + ogit:indexed-attributes ( + ogit:name ); ogit:allowed ( - [ ogit:generates ogit.Data:Log ] - [ ogit:generates ogit:Timeseries ] - [ ogit:dependsOn ogit.MARS:Software ] - [ ogit:uses ogit.Automation:Configuration ] + [ ogit:generates ogit.Data:Log ] + [ ogit:generates ogit:Timeseries ] + [ ogit:dependsOn ogit.MARS:Software ] + [ ogit:uses ogit.Automation:Configuration ] ); . From eb58c8587298c3aca6455d3dfaf63cd67d1248c8 Mon Sep 17 00:00:00 2001 From: CalvinSpolwindAlmato Date: Tue, 16 Dec 2025 10:50:55 +0100 Subject: [PATCH 2/4] Add Cluster as allowed class --- NTO/MARS/Resource/attributes/class.ttl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NTO/MARS/Resource/attributes/class.ttl b/NTO/MARS/Resource/attributes/class.ttl index 397a41b0e7..c681fdca4d 100644 --- a/NTO/MARS/Resource/attributes/class.ttl +++ b/NTO/MARS/Resource/attributes/class.ttl @@ -13,6 +13,6 @@ ogit.MARS.Resource:class dcterms:valid "start=2018-06-01;"; dcterms:creator "fotto@arago.de"; ogit:validation-type "fixed"; - ogit:validation-parameter "Backend,Computation,ContentDelivery,CoreApplication,Database,Environment,Frontend,Infrastructure,Interface,Logistics,Middleware,Monitoring,PhysicalObject,Place,Process,Provider,Security,Service,Storage"; + ogit:validation-parameter "Backend,Computation,ContentDelivery,CoreApplication,Database,Environment,Frontend,Infrastructure,Interface,Logistics,Middleware,Monitoring,PhysicalObject,Place,Process,Provider,Security,Service,Storage,Cluster"; . From 5110e35f8b529ebabbce5ca9cfb2ca6cb1e11055 Mon Sep 17 00:00:00 2001 From: CalvinSpolwindAlmato Date: Tue, 16 Dec 2025 10:51:06 +0100 Subject: [PATCH 3/4] Add edge --- NTO/MARS/entities/Resource.ttl | 1 + 1 file changed, 1 insertion(+) diff --git a/NTO/MARS/entities/Resource.ttl b/NTO/MARS/entities/Resource.ttl index c78eb2c51c..aa7748faac 100644 --- a/NTO/MARS/entities/Resource.ttl +++ b/NTO/MARS/entities/Resource.ttl @@ -48,6 +48,7 @@ ogit.MARS:Resource [ ogit:generates ogit.Data:Log ] [ ogit:generates ogit:Timeseries ] [ ogit:dependsOn ogit.MARS:Software ] + [ ogit:dependsOn ogit.MARS:Resource ] [ ogit:uses ogit.Automation:Configuration ] ); . From 888349f50c95f0c2302f4c35ded04e3bc21041c6 Mon Sep 17 00:00:00 2001 From: CalvinSpolwindAlmato Date: Tue, 16 Dec 2025 14:32:54 +0100 Subject: [PATCH 4/4] Add attributes to MARS:Resource --- NTO/MARS/entities/Resource.ttl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/NTO/MARS/entities/Resource.ttl b/NTO/MARS/entities/Resource.ttl index aa7748faac..8e8cb3adc6 100644 --- a/NTO/MARS/entities/Resource.ttl +++ b/NTO/MARS/entities/Resource.ttl @@ -40,6 +40,8 @@ ogit.MARS:Resource ogit.Automation:marsNodeType ogit:tenantId + ogit:lowerLimit + ogit:type ); ogit:indexed-attributes ( ogit:name