From 264e2edf748673adc47fed5d34ebd3f69efc6b13 Mon Sep 17 00:00:00 2001 From: Lukas Harzenetter Date: Tue, 8 Dec 2020 12:18:14 +0100 Subject: [PATCH] fix test cases --- .../rest/resources/AbstractResourceTest.java | 2 +- .../ServiceTemplateResourceTest.java | 6 +- .../TopologyTemplateResourceTest.java | 6 +- .../servicetemplates/DriverInjection.json | 97 ++++++------ ...tInjectionOptions-DriverInjectionTest.json | 63 ++++---- .../baobab_topologytemplate.json | 8 +- .../farm_topologytemplate.json | 42 ++++-- .../servicetemplates/newVersion.json | 14 +- ...MinimalExampleWithAllPropertyVariants.json | 138 ++++++++--------- ...MinimalExampleWithAllPropertyVariants.json | 140 +++++++++--------- 10 files changed, 273 insertions(+), 243 deletions(-) diff --git a/org.eclipse.winery.repository.rest/src/test/java/org/eclipse/winery/repository/rest/resources/AbstractResourceTest.java b/org.eclipse.winery.repository.rest/src/test/java/org/eclipse/winery/repository/rest/resources/AbstractResourceTest.java index 9c27f4b5b8..c54a7c5171 100644 --- a/org.eclipse.winery.repository.rest/src/test/java/org/eclipse/winery/repository/rest/resources/AbstractResourceTest.java +++ b/org.eclipse.winery.repository.rest/src/test/java/org/eclipse/winery/repository/rest/resources/AbstractResourceTest.java @@ -136,7 +136,7 @@ public void assertGet(String restURL, String fileName) { .get(callURL(restURL)) .then() .log() - .ifValidationFails() + .all() .statusCode(200) .extract() .response() diff --git a/org.eclipse.winery.repository.rest/src/test/java/org/eclipse/winery/repository/rest/resources/servicetemplates/ServiceTemplateResourceTest.java b/org.eclipse.winery.repository.rest/src/test/java/org/eclipse/winery/repository/rest/resources/servicetemplates/ServiceTemplateResourceTest.java index c8e3faa7cf..cac151845f 100644 --- a/org.eclipse.winery.repository.rest/src/test/java/org/eclipse/winery/repository/rest/resources/servicetemplates/ServiceTemplateResourceTest.java +++ b/org.eclipse.winery.repository.rest/src/test/java/org/eclipse/winery/repository/rest/resources/servicetemplates/ServiceTemplateResourceTest.java @@ -60,7 +60,8 @@ public void getServicetemplate() throws Exception { @Test public void getServiceTemplateWithProperties() throws Exception { this.setRevisionTo("3465576f5b46079bb26f5c8e93663424440421a0"); - this.assertGet("servicetemplates/http%253A%252F%252Fwinery.opentosca.org%252Ftest%252Fservicetemplates%252Fponyuniverse%252Fdriverinjection/DriverInjectionTest/topologytemplate", "entitytypes/servicetemplates/DriverInjection.json"); + this.assertGet("servicetemplates/http%253A%252F%252Fwinery.opentosca.org%252Ftest%252Fservicetemplates%252Fponyuniverse%252Fdriverinjection/DriverInjectionTest/topologytemplate", + "entitytypes/servicetemplates/DriverInjection.json"); } @Test @@ -119,7 +120,8 @@ public void getXaasPackagerData() throws Exception { @Test public void checkJsonOfServiceTemplateMinimalExampleWithAllPropertyVariants() throws Exception { this.setRevisionTo("origin/plain"); - this.assertGet("servicetemplates/http%253A%252F%252Fplain.winery.opentosca.org%252Fservicetemplates/ServiceTemplateMinimalExampleWithAllPropertyVariants", "servicetemplates/plain-ServiceTemplateMinimalExampleWithAllPropertyVariants.json"); + this.assertGet("servicetemplates/http%253A%252F%252Fplain.winery.opentosca.org%252Fservicetemplates/ServiceTemplateMinimalExampleWithAllPropertyVariants", + "servicetemplates/plain-ServiceTemplateMinimalExampleWithAllPropertyVariants.json"); } @Test diff --git a/org.eclipse.winery.repository.rest/src/test/java/org/eclipse/winery/repository/rest/resources/servicetemplates/topologytemplates/TopologyTemplateResourceTest.java b/org.eclipse.winery.repository.rest/src/test/java/org/eclipse/winery/repository/rest/resources/servicetemplates/topologytemplates/TopologyTemplateResourceTest.java index 6c64079eb4..7a520d3473 100644 --- a/org.eclipse.winery.repository.rest/src/test/java/org/eclipse/winery/repository/rest/resources/servicetemplates/topologytemplates/TopologyTemplateResourceTest.java +++ b/org.eclipse.winery.repository.rest/src/test/java/org/eclipse/winery/repository/rest/resources/servicetemplates/topologytemplates/TopologyTemplateResourceTest.java @@ -46,7 +46,8 @@ public void getServicetemplate() throws Exception { @Test public void getComponentInstanceJSON() throws Exception { this.setRevisionTo("3fe0df76e98d46ead68295920e5d1cf1354bdea1"); - this.assertGet("servicetemplates/http%253A%252F%252Fwinery.opentosca.org%252Ftest%252Fservicetemplates%252Ffruits/baobab_serviceTemplate/topologytemplate/", "servicetemplates/baobab_topologytemplate.json"); + this.assertGet("servicetemplates/http%253A%252F%252Fwinery.opentosca.org%252Ftest%252Fservicetemplates%252Ffruits/baobab_serviceTemplate/topologytemplate/", + "servicetemplates/baobab_topologytemplate.json"); } @Test @@ -87,7 +88,8 @@ public void apacheSparkAppOnVspheretopologyTemplateUpdateWithEmptyListsGetTheLis @Test public void farmTopologyTemplateIsCorrectlyReturnAsJson() throws Exception { this.setRevisionTo("2d35f0d3c15b384c53df10967164d97e4a7dd6f2"); - this.assertGet("servicetemplates/http%253A%252F%252Fwinery.opentosca.org%252Ftest%252Fservicetemplates%252Ffruits/farm/topologytemplate/", "servicetemplates/farm_topologytemplate.json"); + this.assertGet("servicetemplates/http%253A%252F%252Fwinery.opentosca.org%252Ftest%252Fservicetemplates%252Ffruits/farm/topologytemplate/", + "servicetemplates/farm_topologytemplate.json"); } @Test diff --git a/org.eclipse.winery.repository.rest/src/test/resources/entitytypes/servicetemplates/DriverInjection.json b/org.eclipse.winery.repository.rest/src/test/resources/entitytypes/servicetemplates/DriverInjection.json index 04f91c0573..570f120c0e 100644 --- a/org.eclipse.winery.repository.rest/src/test/resources/entitytypes/servicetemplates/DriverInjection.json +++ b/org.eclipse.winery.repository.rest/src/test/resources/entitytypes/servicetemplates/DriverInjection.json @@ -5,48 +5,6 @@ ], "otherAttributes": { }, - "relationshipTemplates": [ - { - "id": "con_25", - "documentation": [ - ], - "any": [ - ], - "otherAttributes": { - }, - "type": "{http://winery.opentosca.org/test/ponyuniverse}standsOn", - "sourceElement": { - "ref": "shetland_pony" - }, - "targetElement": { - "ref": "straw" - }, - "name": "con_25" - }, - { - "id": "con_47", - "documentation": [ - ], - "any": [ - ], - "otherAttributes": { - }, - "properties": { - "propertyType": "KV", - "kvproperties": { - "Driver": "" - } - }, - "type": "{http://winery.opentosca.org/test/ponyuniverse}attendTo", - "sourceElement": { - "ref": "shetland_pony" - }, - "targetElement": { - "ref": "ponycompetition" - }, - "name": "con_47" - } - ], "nodeTemplates": [ { "id": "shetland_pony", @@ -82,8 +40,8 @@ "name": "shetland_pony", "minInstances": 1, "maxInstances": "1", - "x": "677", - "y": "161" + "y": "161", + "x": "677" }, { "id": "straw", @@ -100,8 +58,8 @@ "name": "straw", "minInstances": 1, "maxInstances": "1", - "x": "677", - "y": "545" + "y": "545", + "x": "677" }, { "id": "ponycompetition", @@ -148,8 +106,51 @@ "name": "ponycompetition", "minInstances": 1, "maxInstances": "1", - "x": "1237", - "y": "137" + "y": "137", + "x": "1237" + } + ], + "relationshipTemplates": [ + { + "id": "con_25", + "documentation": [ + ], + "any": [ + ], + "otherAttributes": { + }, + "type": "{http://winery.opentosca.org/test/ponyuniverse}standsOn", + "sourceElement": { + "ref": "shetland_pony" + }, + "targetElement": { + "ref": "straw" + }, + "name": "con_25" + }, + { + "id": "con_47", + "documentation": [ + ], + "any": [ + ], + "otherAttributes": { + }, + "properties": { + "propertyType": "KV", + "namespace": "http://winery.opentosca.org/test/ponyuniverse/propertiesdefinition/winery", + "kvproperties": { + "Driver": "" + } + }, + "type": "{http://winery.opentosca.org/test/ponyuniverse}attendTo", + "sourceElement": { + "ref": "shetland_pony" + }, + "targetElement": { + "ref": "ponycompetition" + }, + "name": "con_47" } ] } diff --git a/org.eclipse.winery.repository.rest/src/test/resources/servicetemplates/ServiceTemplateResource-getInjectionOptions-DriverInjectionTest.json b/org.eclipse.winery.repository.rest/src/test/resources/servicetemplates/ServiceTemplateResource-getInjectionOptions-DriverInjectionTest.json index ef7d866b81..ea76125e39 100644 --- a/org.eclipse.winery.repository.rest/src/test/resources/servicetemplates/ServiceTemplateResource-getInjectionOptions-DriverInjectionTest.json +++ b/org.eclipse.winery.repository.rest/src/test/resources/servicetemplates/ServiceTemplateResource-getInjectionOptions-DriverInjectionTest.json @@ -6,31 +6,6 @@ ], "otherAttributes": { }, - "relationshipTemplates": [ - { - "id": "con_47", - "documentation": [ - ], - "any": [ - ], - "otherAttributes": { - }, - "properties": { - "propertyType": "KV", - "kvproperties": { - "Driver": "" - } - }, - "type": "{http://winery.opentosca.org/test/ponyuniverse}attendTo", - "sourceElement": { - "ref": "shetland_pony" - }, - "targetElement": { - "ref": "ponycompetition" - }, - "name": "con_47" - } - ], "nodeTemplates": [ { "id": "shetland_pony", @@ -66,8 +41,8 @@ "name": "shetland_pony", "minInstances": 1, "maxInstances": "1", - "x": "677", - "y": "161" + "y": "161", + "x": "677" }, { "id": "ponycompetition", @@ -114,8 +89,34 @@ "name": "ponycompetition", "minInstances": 1, "maxInstances": "1", - "x": "1237", - "y": "137" + "y": "137", + "x": "1237" + } + ], + "relationshipTemplates": [ + { + "id": "con_47", + "documentation": [ + ], + "any": [ + ], + "otherAttributes": { + }, + "properties": { + "propertyType": "KV", + "namespace": "http://winery.opentosca.org/test/ponyuniverse/propertiesdefinition/winery", + "kvproperties": { + "Driver": "" + } + }, + "type": "{http://winery.opentosca.org/test/ponyuniverse}attendTo", + "sourceElement": { + "ref": "shetland_pony" + }, + "targetElement": { + "ref": "ponycompetition" + }, + "name": "con_47" } ] }, @@ -190,8 +191,8 @@ "name": "dressageequipment", "minInstances": 1, "maxInstances": "1", - "x": "804", - "y": "270" + "y": "270", + "x": "804" } ], "relationshipTemplates": [ diff --git a/org.eclipse.winery.repository.rest/src/test/resources/servicetemplates/baobab_topologytemplate.json b/org.eclipse.winery.repository.rest/src/test/resources/servicetemplates/baobab_topologytemplate.json index 077f470057..9061874270 100644 --- a/org.eclipse.winery.repository.rest/src/test/resources/servicetemplates/baobab_topologytemplate.json +++ b/org.eclipse.winery.repository.rest/src/test/resources/servicetemplates/baobab_topologytemplate.json @@ -19,6 +19,8 @@ }, "properties": { "propertyType": "KV", + "namespace": "http://winery.opentosca.org/test/nodetypes/fruits", + "elementName": "BaobabProperties", "kvproperties": { "Antioxidants": "", "VitaminC": "", @@ -31,10 +33,10 @@ "name": "baobab", "minInstances": 1, "maxInstances": "1", - "x": "678", - "y": "287" + "y": "287", + "x": "678" } ], "relationshipTemplates": [ ] -} +} \ No newline at end of file diff --git a/org.eclipse.winery.repository.rest/src/test/resources/servicetemplates/farm_topologytemplate.json b/org.eclipse.winery.repository.rest/src/test/resources/servicetemplates/farm_topologytemplate.json index 7fd6ec75ad..1c5b72399d 100644 --- a/org.eclipse.winery.repository.rest/src/test/resources/servicetemplates/farm_topologytemplate.json +++ b/org.eclipse.winery.repository.rest/src/test/resources/servicetemplates/farm_topologytemplate.json @@ -21,8 +21,8 @@ "name": "plantage", "minInstances": 1, "maxInstances": "1", - "x": "958", - "y": "894" + "y": "894", + "x": "958" }, { "id": "tree", @@ -39,8 +39,8 @@ "name": "tree", "minInstances": 1, "maxInstances": "1", - "x": "606", - "y": "671" + "y": "671", + "x": "606" }, { "id": "tree_2", @@ -57,8 +57,8 @@ "name": "tree_3", "minInstances": 1, "maxInstances": "1", - "x": "1441", - "y": "645" + "y": "645", + "x": "1441" }, { "id": "baobab", @@ -73,6 +73,8 @@ }, "properties": { "propertyType": "KV", + "namespace": "http://winery.opentosca.org/test/nodetypes/fruits", + "elementName": "BaobabProperties", "kvproperties": { "Antioxidants": "", "VitaminC": "", @@ -85,8 +87,8 @@ "name": "baobab", "minInstances": 1, "maxInstances": "1", - "x": "324", - "y": "333" + "y": "333", + "x": "324" }, { "id": "orange", @@ -101,6 +103,8 @@ }, "properties": { "propertyType": "KV", + "namespace": "http://winery.opentosca.org/test/nodetypes/fruits", + "elementName": "OrangeProperties", "kvproperties": { "Antioxidants": "", "VitaminC": "", @@ -113,8 +117,8 @@ "name": "orange", "minInstances": 1, "maxInstances": "1", - "x": "1284", - "y": "331" + "y": "331", + "x": "1284" }, { "id": "orange_2", @@ -129,6 +133,8 @@ }, "properties": { "propertyType": "KV", + "namespace": "http://winery.opentosca.org/test/nodetypes/fruits", + "elementName": "OrangeProperties", "kvproperties": { "Antioxidants": "", "VitaminC": "", @@ -141,8 +147,8 @@ "name": "orange_3", "minInstances": 1, "maxInstances": "1", - "x": "1599", - "y": "329" + "y": "329", + "x": "1599" }, { "id": "baobab_2", @@ -157,6 +163,8 @@ }, "properties": { "propertyType": "KV", + "namespace": "http://winery.opentosca.org/test/nodetypes/fruits", + "elementName": "BaobabProperties", "kvproperties": { "Antioxidants": "", "VitaminC": "", @@ -169,8 +177,8 @@ "name": "baobab_3", "minInstances": 1, "maxInstances": "1", - "x": "606", - "y": "219" + "y": "219", + "x": "606" }, { "id": "baobab_3", @@ -185,6 +193,8 @@ }, "properties": { "propertyType": "KV", + "namespace": "http://winery.opentosca.org/test/nodetypes/fruits", + "elementName": "BaobabProperties", "kvproperties": { "Antioxidants": "", "VitaminC": "", @@ -197,8 +207,8 @@ "name": "baobab_4", "minInstances": 1, "maxInstances": "1", - "x": "900", - "y": "325" + "y": "325", + "x": "900" } ], "relationshipTemplates": [ diff --git a/org.eclipse.winery.repository.rest/src/test/resources/servicetemplates/newVersion.json b/org.eclipse.winery.repository.rest/src/test/resources/servicetemplates/newVersion.json index 0ec15ead21..a52ec91ab0 100644 --- a/org.eclipse.winery.repository.rest/src/test/resources/servicetemplates/newVersion.json +++ b/org.eclipse.winery.repository.rest/src/test/resources/servicetemplates/newVersion.json @@ -58,6 +58,8 @@ }, "properties": { "propertyType": "KV", + "namespace": "http://plain.winery.opentosca.org/requirementtypes/propertiesdefinition/winery", + "elementName": "properties", "kvproperties": { "key1": "val1", "key2": "val2" @@ -106,6 +108,8 @@ }, "properties": { "propertyType": "KV", + "namespace": "http://plain.winery.opentosca.org/capabilitytypes/propertiesdefinition/winery", + "elementName": "properties", "kvproperties": { "key1": "", "key2": "" @@ -130,8 +134,8 @@ "name": "NodeTypeWithThreeReqCapPairsCoveringAllReqCapVariants", "minInstances": 1, "maxInstances": "1", - "x": "786", - "y": "451" + "y": "451", + "x": "786" }, { "id": "NodeTypeWithOneReqCapPairWithoutProperties", @@ -163,8 +167,8 @@ "name": "NodeTypeWithOneReqCapPairWithoutProperties", "minInstances": 1, "maxInstances": "1", - "x": "782", - "y": "147" + "y": "147", + "x": "782" } ], "relationshipTemplates": [ @@ -315,4 +319,4 @@ "importType": "http://docs.oasis-open.org/tosca/ns/2011/12" } ] -} \ No newline at end of file +} diff --git a/org.eclipse.winery.repository.rest/src/test/resources/servicetemplates/plain-ServiceTemplateMinimalExampleWithAllPropertyVariants.json b/org.eclipse.winery.repository.rest/src/test/resources/servicetemplates/plain-ServiceTemplateMinimalExampleWithAllPropertyVariants.json index 6ab236bdca..f8c431cbbd 100644 --- a/org.eclipse.winery.repository.rest/src/test/resources/servicetemplates/plain-ServiceTemplateMinimalExampleWithAllPropertyVariants.json +++ b/org.eclipse.winery.repository.rest/src/test/resources/servicetemplates/plain-ServiceTemplateMinimalExampleWithAllPropertyVariants.json @@ -22,6 +22,75 @@ ], "otherAttributes": { }, + "nodeTemplates": [ + { + "id": "NodeTypeWithoutProperties", + "documentation": [ + ], + "any": [ + ], + "otherAttributes": { + "{http://www.opentosca.org/winery/extensions/tosca/2013/02/12}location": "undefined", + "{http://www.opentosca.org/winery/extensions/tosca/2013/02/12}x": "617", + "{http://www.opentosca.org/winery/extensions/tosca/2013/02/12}y": "44" + }, + "type": "{http://plain.winery.opentosca.org/nodetypes}NodeTypeWithoutProperties", + "name": "NodeTypeWithoutProperties", + "minInstances": 1, + "maxInstances": "1", + "y": "44", + "x": "617" + }, + { + "id": "NodeTypeWithXmlElementProperty", + "documentation": [ + ], + "any": [ + ], + "otherAttributes": { + "{http://www.opentosca.org/winery/extensions/tosca/2013/02/12}location": "undefined", + "{http://www.opentosca.org/winery/extensions/tosca/2013/02/12}x": "874", + "{http://www.opentosca.org/winery/extensions/tosca/2013/02/12}y": "462" + }, + "properties": { + "propertyType": "XML", + "any": "\n\n NameAddressCityCountry\n Title55.5\n \n " + }, + "type": "{http://plain.winery.opentosca.org/nodetypes}NodeTypeWithXmlElementProperty", + "name": "NodeTypeWithXmlElementProperty", + "minInstances": 1, + "maxInstances": "1", + "y": "462", + "x": "874" + }, + { + "id": "NodeTypeWithTwoKVProperties", + "documentation": [ + ], + "any": [ + ], + "otherAttributes": { + "{http://www.opentosca.org/winery/extensions/tosca/2013/02/12}location": "undefined", + "{http://www.opentosca.org/winery/extensions/tosca/2013/02/12}x": "387", + "{http://www.opentosca.org/winery/extensions/tosca/2013/02/12}y": "461" + }, + "properties": { + "propertyType": "KV", + "namespace": "http://plain.winery.opentosca.org/nodetypes/propertiesdefinition/winery", + "elementName": "properties", + "kvproperties": { + "key1": "value", + "key2": "" + } + }, + "type": "{http://plain.winery.opentosca.org/nodetypes}NodeTypeWithTwoKVProperties", + "name": "NodeTypeWithTwoKVProperties", + "minInstances": 1, + "maxInstances": "1", + "y": "461", + "x": "387" + } + ], "relationshipTemplates": [ { "id": "con_16", @@ -50,6 +119,8 @@ }, "properties": { "propertyType": "KV", + "namespace": "http://plain.winery.opentosca.org/relationshiptype/properties", + "elementName": "properties", "kvproperties": { "key1": "", "key2": "" @@ -85,73 +156,6 @@ }, "name": "con_40" } - ], - "nodeTemplates": [ - { - "id": "NodeTypeWithoutProperties", - "documentation": [ - ], - "any": [ - ], - "otherAttributes": { - "{http://www.opentosca.org/winery/extensions/tosca/2013/02/12}location": "undefined", - "{http://www.opentosca.org/winery/extensions/tosca/2013/02/12}x": "617", - "{http://www.opentosca.org/winery/extensions/tosca/2013/02/12}y": "44" - }, - "type": "{http://plain.winery.opentosca.org/nodetypes}NodeTypeWithoutProperties", - "name": "NodeTypeWithoutProperties", - "minInstances": 1, - "maxInstances": "1", - "x": "617", - "y": "44" - }, - { - "id": "NodeTypeWithXmlElementProperty", - "documentation": [ - ], - "any": [ - ], - "otherAttributes": { - "{http://www.opentosca.org/winery/extensions/tosca/2013/02/12}location": "undefined", - "{http://www.opentosca.org/winery/extensions/tosca/2013/02/12}x": "874", - "{http://www.opentosca.org/winery/extensions/tosca/2013/02/12}y": "462" - }, - "properties": { - "propertyType": "XML", - "any": "\n\n NameAddressCityCountry\n Title55.5\n \n " - }, - "type": "{http://plain.winery.opentosca.org/nodetypes}NodeTypeWithXmlElementProperty", - "name": "NodeTypeWithXmlElementProperty", - "minInstances": 1, - "maxInstances": "1", - "x": "874", - "y": "462" - }, - { - "id": "NodeTypeWithTwoKVProperties", - "documentation": [ - ], - "any": [ - ], - "otherAttributes": { - "{http://www.opentosca.org/winery/extensions/tosca/2013/02/12}location": "undefined", - "{http://www.opentosca.org/winery/extensions/tosca/2013/02/12}x": "387", - "{http://www.opentosca.org/winery/extensions/tosca/2013/02/12}y": "461" - }, - "properties": { - "propertyType": "KV", - "kvproperties": { - "key1": "value", - "key2": "" - } - }, - "type": "{http://plain.winery.opentosca.org/nodetypes}NodeTypeWithTwoKVProperties", - "name": "NodeTypeWithTwoKVProperties", - "minInstances": 1, - "maxInstances": "1", - "x": "387", - "y": "461" - } ] }, "name": "ServiceTemplateMinimalExampleWithAllPropertyVariants", diff --git a/org.eclipse.winery.repository.rest/src/test/resources/servicetemplates/topologytemplates/plain-TopologyTemplateMinimalExampleWithAllPropertyVariants.json b/org.eclipse.winery.repository.rest/src/test/resources/servicetemplates/topologytemplates/plain-TopologyTemplateMinimalExampleWithAllPropertyVariants.json index 623fc78bc3..e94244bf68 100644 --- a/org.eclipse.winery.repository.rest/src/test/resources/servicetemplates/topologytemplates/plain-TopologyTemplateMinimalExampleWithAllPropertyVariants.json +++ b/org.eclipse.winery.repository.rest/src/test/resources/servicetemplates/topologytemplates/plain-TopologyTemplateMinimalExampleWithAllPropertyVariants.json @@ -5,6 +5,75 @@ ], "otherAttributes": { }, + "nodeTemplates": [ + { + "id": "NodeTypeWithoutProperties", + "documentation": [ + ], + "any": [ + ], + "otherAttributes": { + "{http://www.opentosca.org/winery/extensions/tosca/2013/02/12}location": "undefined", + "{http://www.opentosca.org/winery/extensions/tosca/2013/02/12}x": "617", + "{http://www.opentosca.org/winery/extensions/tosca/2013/02/12}y": "44" + }, + "type": "{http://plain.winery.opentosca.org/nodetypes}NodeTypeWithoutProperties", + "name": "NodeTypeWithoutProperties", + "minInstances": 1, + "maxInstances": "1", + "y": "44", + "x": "617" + }, + { + "id": "NodeTypeWithXmlElementProperty", + "documentation": [ + ], + "any": [ + ], + "otherAttributes": { + "{http://www.opentosca.org/winery/extensions/tosca/2013/02/12}location": "undefined", + "{http://www.opentosca.org/winery/extensions/tosca/2013/02/12}x": "874", + "{http://www.opentosca.org/winery/extensions/tosca/2013/02/12}y": "462" + }, + "properties": { + "propertyType": "XML", + "any": "\n\n NameAddressCityCountry\n Title55.5\n \n " + }, + "type": "{http://plain.winery.opentosca.org/nodetypes}NodeTypeWithXmlElementProperty", + "name": "NodeTypeWithXmlElementProperty", + "minInstances": 1, + "maxInstances": "1", + "y": "462", + "x": "874" + }, + { + "id": "NodeTypeWithTwoKVProperties", + "documentation": [ + ], + "any": [ + ], + "otherAttributes": { + "{http://www.opentosca.org/winery/extensions/tosca/2013/02/12}location": "undefined", + "{http://www.opentosca.org/winery/extensions/tosca/2013/02/12}x": "387", + "{http://www.opentosca.org/winery/extensions/tosca/2013/02/12}y": "461" + }, + "properties": { + "propertyType": "KV", + "namespace": "http://plain.winery.opentosca.org/nodetypes/propertiesdefinition/winery", + "elementName": "properties", + "kvproperties": { + "key1": "value", + "key2": "" + } + }, + "type": "{http://plain.winery.opentosca.org/nodetypes}NodeTypeWithTwoKVProperties", + "name": "NodeTypeWithTwoKVProperties", + "minInstances": 1, + "maxInstances": "1", + "y": "461", + "x": "387" + } + ], "relationshipTemplates": [ { "id": "con_16", @@ -33,6 +102,8 @@ }, "properties": { "propertyType": "KV", + "namespace": "http://plain.winery.opentosca.org/relationshiptype/properties", + "elementName": "properties", "kvproperties": { "key1": "", "key2": "" @@ -68,72 +139,5 @@ }, "name": "con_40" } - ], - "nodeTemplates": [ - { - "id": "NodeTypeWithoutProperties", - "documentation": [ - ], - "any": [ - ], - "otherAttributes": { - "{http://www.opentosca.org/winery/extensions/tosca/2013/02/12}location": "undefined", - "{http://www.opentosca.org/winery/extensions/tosca/2013/02/12}x": "617", - "{http://www.opentosca.org/winery/extensions/tosca/2013/02/12}y": "44" - }, - "type": "{http://plain.winery.opentosca.org/nodetypes}NodeTypeWithoutProperties", - "name": "NodeTypeWithoutProperties", - "minInstances": 1, - "maxInstances": "1", - "x": "617", - "y": "44" - }, - { - "id": "NodeTypeWithXmlElementProperty", - "documentation": [ - ], - "any": [ - ], - "otherAttributes": { - "{http://www.opentosca.org/winery/extensions/tosca/2013/02/12}location": "undefined", - "{http://www.opentosca.org/winery/extensions/tosca/2013/02/12}x": "874", - "{http://www.opentosca.org/winery/extensions/tosca/2013/02/12}y": "462" - }, - "properties": { - "propertyType": "XML", - "any": "\n\n NameAddressCityCountry\n Title55.5\n \n " - }, - "type": "{http://plain.winery.opentosca.org/nodetypes}NodeTypeWithXmlElementProperty", - "name": "NodeTypeWithXmlElementProperty", - "minInstances": 1, - "maxInstances": "1", - "x": "874", - "y": "462" - }, - { - "id": "NodeTypeWithTwoKVProperties", - "documentation": [ - ], - "any": [ - ], - "otherAttributes": { - "{http://www.opentosca.org/winery/extensions/tosca/2013/02/12}location": "undefined", - "{http://www.opentosca.org/winery/extensions/tosca/2013/02/12}x": "387", - "{http://www.opentosca.org/winery/extensions/tosca/2013/02/12}y": "461" - }, - "properties": { - "propertyType": "KV", - "kvproperties": { - "key1": "value", - "key2": "" - } - }, - "type": "{http://plain.winery.opentosca.org/nodetypes}NodeTypeWithTwoKVProperties", - "name": "NodeTypeWithTwoKVProperties", - "minInstances": 1, - "maxInstances": "1", - "x": "387", - "y": "461" - } ] -} \ No newline at end of file +}