From fba2195c7e5a415abc732f8f4348e48a2ce0b995 Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Wed, 26 Jun 2024 17:11:48 +0200 Subject: [PATCH] Fixed examples --- .../resources/vre-configuration-example.json | 302 +++++++----------- .../resources/vre-configuration-template.json | 89 ------ 2 files changed, 118 insertions(+), 273 deletions(-) delete mode 100644 src/test/resources/vre-configuration-template.json diff --git a/src/test/resources/vre-configuration-example.json b/src/test/resources/vre-configuration-example.json index 7e12bb5..a9b6646 100644 --- a/src/test/resources/vre-configuration-example.json +++ b/src/test/resources/vre-configuration-example.json @@ -1,208 +1,142 @@ { - "type": "Configuration", - "consistsOf": [ + "type": "Context", + "id": "ded93b00-934c-11ee-869e-bfa3de466a2b", + "name": "devVRE", + "parent": + { + "type": "IsParentOf", + "id": "4d47b286-bfe5-4ab0-a5fa-85139cadfaa9", + "source": { - "type": "IsIdentifiedBy", - "propagationConstraint": { - "type": "PropagationConstraint", - "remove": "cascade", - "add": "propagate" - }, - "target": { - "type": "IdentifierFacet", - "value": "VRE Configuration", - "identificationType": "STRING", - "comment" : "Should we relate this resource with the Virtual Services?", - "Name": "devVRE", - "Description": "This VRE is used for development", - "Designer":"luca.frosini", - "Managers": ["luca.frosini", "pasquale.pagano"], - "Start Date": "2024-06-11 10:49:20.618 +0000", - "End Date": "2025-06-11 10:49:20.618 +0000" + "type": "Context", + "id": "2a9f4a4b-5f3e-4eee-9630-e2f7b2e58c34", + "name": "devsec" + } + }, + "children": [], + "state": "active", + "information": { + "Description": "This VRE is used for development", + "Designer": "luca.frosini", + "Managers": [ "luca.frosini", "pasquale.pagano", "leonardo.candela" ], + "From": "2024-06-11 10:49:20.618 +0000", + "To": "2025-06-11 10:49:20.618 +0000" + }, + "events": [ + { + "type": "Event", + "what": "created", + "when": "2024-06-10 10:49:20.618 +0000", + "who": "luca.frosini", + "comment": "Created devVE context." + }, + { + "type": "Event", + "what": "pending", + "when": "2024-06-10 10:49:20.618 +0000", + "who": "luca.frosini", + "comment": "The VRE has been defined. This event is added by the resource-manager", + "definition": { + "encoded": "The Context definition is saved encoded in BASE64." } }, - { - "type": "ConsistsOf", - "propagationConstraint": { - "type": "PropagationConstraint", - "remove": "cascade", - "add": "propagate" - }, - "target": { - "type": "StateFacet", - "value": "created | active | failed | dissmissed | expired " + { + "type": "Event", + "what": "failed", + "when": "2024-06-10 12:49:20.618 +0000", + "who": "resource-manager", + "comment": "The process failed see report. This event is added by the resource-manager.", + "report": { + "encoded": "The generated report part is saved encoded in BASE64." } }, - { - "type": "ConsistsOf", - "propagationConstraint": { - "type": "PropagationConstraint", - "remove": "cascade", - "add": "propagate" - }, - "target": { - "type": "EventFacet", - "value": "created", - "date": "2024-06-10 10:49:20.618 +0000", - "comment": "Created in IS devVE context", - "report": { - "encoded":"The generated report part is saved encoded in BASE64.", - "filename": "devVE.json" - } + { + "type": "Event", + "what": "active", + "when": "2024-06-10 12:49:20.618 +0000", + "who": "resource-manager", + "comment": "All steps of devVE context creation completed successfully. The context is now active. This event is added by the resource-manager.", + "report": { + "encoded": "The generated report part is saved encoded in BASE64." } }, - { - "type": "ConsistsOf", - "propagationConstraint": { - "type": "PropagationConstraint", - "remove": "cascade", - "add": "propagate" - }, - "target": { - "type": "EventFacet", - "value": "failed", - "date": "2024-06-10 12:49:20.618 +0000", - "comment": "The process failed see report", - "report": { - "encoded":"The generated report part is saved encoded in BASE64.", - "filename": "devVE.json" - } + { + "type": "Event", + "what": "renamed", + "when": "2024-06-12 10:49:20.618 +0000", + "who": "luca.frosini", + "old": "/gcube/devsec/devVE", + "new": "/gcube/devsec/devVRE", + "comment": "It was created with the wrong name. The right name is devVRE", + "report": { + "encoded": "The generated report is saved encoded in BASE64." } }, - { - "type": "ConsistsOf", - "propagationConstraint": { - "type": "PropagationConstraint", - "remove": "cascade", - "add": "propagate" - }, - "target": { - "type": "EventFacet", - "value": "active", - "date": "2024-06-10 12:49:20.618 +0000", - "comment": "All steps of devVE context creation completed successfully. The context is now active", - "report": { - "encoded":"The generated report part is saved encoded in BASE64.", - "filename": "devVE.json" - } + { + "type": "Event", + "what": "moved", + "when": "2024-06-13 10:49:20.618 +0000", + "who": "pasquale.pagano", + "old": "/gcube/devsec/devVRE", + "new": "/gcube/dev/devVRE", + "comment": "The /gcube/devsec context has a confusing name and it will be dissmissed", + "report": { + "encoded": "The generated report is saved encoded in BASE64." } }, - { - "type": "ConsistsOf", - "propagationConstraint": { - "type": "PropagationConstraint", - "remove": "cascade", - "add": "propagate" - }, - "target": { - "type": "EventFacet", - "value": "renamed", - "date": "2024-06-12 10:49:20.618 +0000", - "old": "/gcube/devsec/devVE", - "new": "/gcube/devsec/devVRE", - "comment": "It was created with the wrong name. The right name is devVRE", - "report": { - "encoded":"The generated report is saved encoded in BASE64.", - "filename": "devVRE.json" - } + { + "type": "Event", + "what": "attributeChange", + "when": "2024-06-15 10:49:20.618 +0000", + "affectedAttribute": "information.Managers", + "old": [ "luca.frosini", "pasquale.pagano" ], + "new": [ "luca.frosini", "pasquale.pagano", "leonardo.candela" ], + "comment": "Added Leo as Manager", + "report": { + "encoded": "The generated report is saved encoded in BASE64." } }, - { - "type": "ConsistsOf", - "propagationConstraint": { - "type": "PropagationConstraint", - "remove": "cascade", - "add": "propagate" - }, - "target": { - "type": "EventFacet", - "value": "moved", - "date": "2024-06-13 10:49:20.618 +0000", - "old": "/gcube/devsec/devVRE", - "new": "/gcube/dev/devVRE", - "comment": "The /gcube/devsec context has a confusing name and it will be dissmissed", - "report": { - "encoded":"The generated report is saved encoded in BASE64.", - "filename": "devVRE.json" - } + { + "type": "Event", + "what": "attributeChange", + "when": "2024-06-15 11:43:10.308 +0000", + "who": "leonardo.candela", + "affectedAttribute": "information.Description", + "old": "These VRE is used for development", + "new": "This VRE is used for development", + "comment": "Fixed grammatical error in description", + "report": { + "encoded": "The generated report is saved encoded in BASE64." } }, - { - "type": "ConsistsOf", - "propagationConstraint": { - "type": "PropagationConstraint", - "remove": "cascade", - "add": "propagate" + { + "type": "Event", + "what": "definitionChange", + "when": "2024-06-15 11:53:24.101 +0000", + "who": "leonardo.candela", + "comment": "Added Catalogue Service", + "definition": { + "encoded": "The Context definition is saved encoded in BASE64." }, - "target": { - "type": "EventFacet", - "value": "attributeChange", - "date": "2024-06-14 10:49:20.618 +0000", - "affectedAttribute" : "Description", - "old": "These VRE is used for development", - "new": "This VRE is used for development", - "comment": "Fixed grammatical error in description", - "report": { - "encoded":"The generated report is saved encoded in BASE64.", - "filename": "devVRE.json" - } + "report": { + "encoded": "The generated report is saved encoded in BASE64." } }, - { - "type": "ConsistsOf", - "propagationConstraint": { - "type": "PropagationConstraint", - "remove": "cascade", - "add": "propagate" + { + "type": "Event", + "what": "definitionChange", + "when": "2024-06-15 11:53:24.101 +0000", + "who": "leonardo.candela", + "comment": "Removed DataMiner Service", + "definition": { + "encoded": "The Context definition is saved encoded in BASE64." }, - "target": { - "type": "EventFacet", - "value": "attributeChange", - "date": "2024-06-15 10:49:20.618 +0000", - "affectedAttribute" : "Managers", - "old": ["luca.frosini", "pasquale.pagano"], - "new": ["luca.frosini", "pasquale.pagano", "leonardo.candela"], - "comment": "Added Leo as Manager", - "report": { - "encoded":"The generated report is saved encoded in BASE64.", - "filename": "devVRE.json" - } - } - }, - { - "type": "ConsistsOf", - "propagationConstraint": { - "type": "PropagationConstraint", - "remove": "cascade", - "add": "propagate" - }, - "target": { - "type": "EventFacet", - "value": "definitionChange", - "comment": "Added Catalogue Service", - "report": { - "encoded":"The generated report is saved encoded in BASE64.", - "filename": "devVRE.json" - } - } - }, - { - "type": "ConsistsOf", - "propagationConstraint": { - "type": "PropagationConstraint", - "remove": "cascade", - "add": "propagate" - }, - "target": { - "type": "EventFacet", - "value": "definitionChange", - "comment": "Removed DataMiner Service", - "report": { - "encoded":"The generated report is saved encoded in BASE64.", - "filename": "devVRE.json" - } + "report": { + "encoded": "The generated report is saved encoded in BASE64." } } ], - "isRelatedTo": [] + "currentDefintion" : { + "encoded": "The Context definition is saved encoded in BASE64." + } } \ No newline at end of file diff --git a/src/test/resources/vre-configuration-template.json b/src/test/resources/vre-configuration-template.json deleted file mode 100644 index fbe62ea..0000000 --- a/src/test/resources/vre-configuration-template.json +++ /dev/null @@ -1,89 +0,0 @@ -{ - "type": "ConfigurationTemplate", - "consistsOf": [ - { - "type": "IsIdentifiedBy", - "propagationConstraint": { - "type": "PropagationConstraint", - "remove": "cascade", - "add": "propagate" - }, - "target": { - "type": "IdentifierFacet", - "value": "VRE Configuration", - "identificationType": "STRING" - } - }, - { - "type": "ConsistsOf", - "propagationConstraint": { - "type": "PropagationConstraint", - "remove": "cascade", - "add": "propagate" - }, - "target": { - "type": "TemplateFacet", - "name": "VRE Information", - "description": "These are the requested information to create a VRE", - "targetFacetType": "SimpleFacet", - "attributes": [ - { - "type": "AttributeProperty", - "name": "Name", - "description": "The name of the context is going to be created. TODO Insert regex which validate the name", - "max": null, - "min": null, - "regexp": null, - "propertyType": "String" - }, - { - "type": "AttributeProperty", - "name": "Description", - "description": "VRE description", - "max": null, - "min": null, - "regexp": null, - "propertyType": "String" - }, - { - "type": "AttributeProperty", - "name": "Designer", - "description": "Designer is the person which initially designed/created the Context.", - "max": null, - "min": null, - "regexp": null, - "propertyType": "String" - }, - { - "type": "AttributeProperty", - "name": "Managers", - "description": "A list fo Managers for the new Context. The Context-Manager role will be added to the selected people for the Context", - "max": null, - "min": null, - "regexp": null, - "propertyType": "List" - }, - { - "type": "AttributeProperty", - "name": "Start Date", - "description": "", - "max": null, - "min": null, - "regexp": null, - "propertyType": "Date" - }, - { - "type": "AttributeProperty", - "name": "End Date", - "description": "", - "max": null, - "min": null, - "regexp": null, - "propertyType": "Date" - } - ] - } - } - ], - "isRelatedTo": [] -} \ No newline at end of file