X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Ftest%2Fresources%2Ftosca%2Fnew-converter%2Ftosca_apex_with_metadata.json;h=4cb5bd8c1829cc364e81e35e56d7b77f2699454b;hb=51de07c4250ac0b9502c6e5c6fe35ed1b310c8b4;hp=687e9b2372a8af0d845fde0736b6ac2fa649512c;hpb=580141f7cf72d4a120722fc7b870dfc5c3017ced;p=clamp.git

diff --git a/src/test/resources/tosca/new-converter/tosca_apex_with_metadata.json b/src/test/resources/tosca/new-converter/tosca_apex_with_metadata.json
index 687e9b23..4cb5bd8c 100644
--- a/src/test/resources/tosca/new-converter/tosca_apex_with_metadata.json
+++ b/src/test/resources/tosca/new-converter/tosca_apex_with_metadata.json
@@ -64,22 +64,41 @@
               "payload": {
                 "type": "object",
                 "description": "Name/value pairs of payload information passed by Policy to the actor",
-                "enum": [
+                "anyOf": [
                   {
                     "title": "resource-assignment",
                     "properties": {
-                      "artifact_name": "baseconfiguration",
-                      "artifact_version": "1.0.0",
-                      "mode": "async",
+                      "artifact_name": {
+                        "title": "artifact_name",
+                        "type": "string",
+                        "default": "baseconfiguration",
+                        "readOnly": "True"
+                      },
+                      "artifact_version": {
+                        "title": "artifact_version",
+                        "type": "string",
+                        "default": "1.0.0",
+                        "readOnly": "True"
+                      },
+                      "mode": {
+                        "title": "mode",
+                        "type": "string",
+                        "default": "async",
+                        "readOnly": "True"
+                      },
                       "data": {
-                        "resource-assignment-properties": {
-                          "request-id": "",
-                          "service-instance-id": "",
-                          "vnf-id": "",
-                          "action-name": "",
-                          "scope-type": "",
-                          "hostname": "",
-                          "vnf_name": ""
+                        "title": "data",
+                        "type": "object",
+                        "properties": {
+                          "resource-assignment-properties": {
+                            "request-id": "",
+                            "service-instance-id": "",
+                            "vnf-id": "",
+                            "action-name": "",
+                            "scope-type": "",
+                            "hostname": "",
+                            "vnf_name": ""
+                          }
                         }
                       }
                     }
@@ -87,18 +106,37 @@
                   {
                     "title": "activate",
                     "properties": {
-                      "artifact_name": "baseconfiguration",
-                      "artifact_version": "1.0.0",
-                      "mode": "async",
+                      "artifact_name": {
+                        "title": "artifact_name",
+                        "type": "string",
+                        "default": "baseconfiguration",
+                        "readOnly": "True"
+                      },
+                      "artifact_version": {
+                        "title": "artifact_version",
+                        "type": "string",
+                        "default": "1.0.0",
+                        "readOnly": "True"
+                      },
+                      "mode": {
+                        "title": "mode",
+                        "type": "string",
+                        "default": "async",
+                        "readOnly": "True"
+                      },
                       "data": {
-                        "resource-assignment-properties": {
-                          "request-id": "",
-                          "service-instance-id": "",
-                          "vnf-id": "",
-                          "action-name": "",
-                          "scope-type": "",
-                          "hostname": "",
-                          "vnf_name": ""
+                        "title": "data",
+                        "type": "object",
+                        "properties": {
+                          "resource-assignment-properties": {
+                            "request-id": "",
+                            "service-instance-id": "",
+                            "vnf-id": "",
+                            "action-name": "",
+                            "scope-type": "",
+                            "hostname": "",
+                            "vnf_name": ""
+                          }
                         }
                       }
                     }
@@ -106,18 +144,37 @@
                   {
                     "title": "activate-restconf",
                     "properties": {
-                      "artifact_name": "baseconfiguration",
-                      "artifact_version": "1.0.0",
-                      "mode": "async",
+                      "artifact_name": {
+                        "title": "artifact_name",
+                        "type": "string",
+                        "default": "baseconfiguration",
+                        "readOnly": "True"
+                      },
+                      "artifact_version": {
+                        "title": "artifact_version",
+                        "type": "string",
+                        "default": "1.0.0",
+                        "readOnly": "True"
+                      },
+                      "mode": {
+                        "title": "mode",
+                        "type": "string",
+                        "default": "async",
+                        "readOnly": "True"
+                      },
                       "data": {
-                        "resource-assignment-properties": {
-                          "request-id": "",
-                          "service-instance-id": "",
-                          "vnf-id": "",
-                          "action-name": "",
-                          "scope-type": "",
-                          "hostname": "",
-                          "vnf_name": ""
+                        "title": "data",
+                        "type": "object",
+                        "properties": {
+                          "resource-assignment-properties": {
+                            "request-id": "",
+                            "service-instance-id": "",
+                            "vnf-id": "",
+                            "action-name": "",
+                            "scope-type": "",
+                            "hostname": "",
+                            "vnf_name": ""
+                          }
                         }
                       }
                     }
@@ -125,18 +182,37 @@
                   {
                     "title": "activate-cli",
                     "properties": {
-                      "artifact_name": "baseconfiguration",
-                      "artifact_version": "1.0.0",
-                      "mode": "async",
+                      "artifact_name": {
+                        "title": "artifact_name",
+                        "type": "string",
+                        "default": "baseconfiguration",
+                        "readOnly": "True"
+                      },
+                      "artifact_version": {
+                        "title": "artifact_version",
+                        "type": "string",
+                        "default": "1.0.0",
+                        "readOnly": "True"
+                      },
+                      "mode": {
+                        "title": "mode",
+                        "type": "string",
+                        "default": "async",
+                        "readOnly": "True"
+                      },
                       "data": {
-                        "resource-assignment-properties": {
-                          "request-id": "",
-                          "service-instance-id": "",
-                          "vnf-id": "",
-                          "action-name": "",
-                          "scope-type": "",
-                          "hostname": "",
-                          "vnf_name": ""
+                        "title": "data",
+                        "type": "object",
+                        "properties": {
+                          "resource-assignment-properties": {
+                            "request-id": "",
+                            "service-instance-id": "",
+                            "vnf-id": "",
+                            "action-name": "",
+                            "scope-type": "",
+                            "hostname": "",
+                            "vnf_name": ""
+                          }
                         }
                       }
                     }
@@ -144,18 +220,37 @@
                   {
                     "title": "assign-activate",
                     "properties": {
-                      "artifact_name": "baseconfiguration",
-                      "artifact_version": "1.0.0",
-                      "mode": "async",
+                      "artifact_name": {
+                        "title": "artifact_name",
+                        "type": "string",
+                        "default": "baseconfiguration",
+                        "readOnly": "True"
+                      },
+                      "artifact_version": {
+                        "title": "artifact_version",
+                        "type": "string",
+                        "default": "1.0.0",
+                        "readOnly": "True"
+                      },
+                      "mode": {
+                        "title": "mode",
+                        "type": "string",
+                        "default": "async",
+                        "readOnly": "True"
+                      },
                       "data": {
-                        "resource-assignment-properties": {
-                          "request-id": "",
-                          "service-instance-id": "",
-                          "vnf-id": "",
-                          "action-name": "",
-                          "scope-type": "",
-                          "hostname": "",
-                          "vnf_name": ""
+                        "title": "data",
+                        "type": "object",
+                        "properties": {
+                          "resource-assignment-properties": {
+                            "request-id": "",
+                            "service-instance-id": "",
+                            "vnf-id": "",
+                            "action-name": "",
+                            "scope-type": "",
+                            "hostname": "",
+                            "vnf_name": ""
+                          }
                         }
                       }
                     }
@@ -163,18 +258,37 @@
                   {
                     "title": "imperative-test-wf",
                     "properties": {
-                      "artifact_name": "baseconfiguration",
-                      "artifact_version": "1.0.0",
-                      "mode": "async",
+                      "artifact_name": {
+                        "title": "artifact_name",
+                        "type": "string",
+                        "default": "baseconfiguration",
+                        "readOnly": "True"
+                      },
+                      "artifact_version": {
+                        "title": "artifact_version",
+                        "type": "string",
+                        "default": "1.0.0",
+                        "readOnly": "True"
+                      },
+                      "mode": {
+                        "title": "mode",
+                        "type": "string",
+                        "default": "async",
+                        "readOnly": "True"
+                      },
                       "data": {
-                        "resource-assignment-properties": {
-                          "request-id": "",
-                          "service-instance-id": "",
-                          "vnf-id": "",
-                          "action-name": "",
-                          "scope-type": "",
-                          "hostname": "",
-                          "vnf_name": ""
+                        "title": "data",
+                        "type": "object",
+                        "properties": {
+                          "resource-assignment-properties": {
+                            "request-id": "",
+                            "service-instance-id": "",
+                            "vnf-id": "",
+                            "action-name": "",
+                            "scope-type": "",
+                            "hostname": "",
+                            "vnf_name": ""
+                          }
                         }
                       }
                     }