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=4519d5c9f2be07739379c5649d6ba53502c38634;hb=2d9f989e0d37002c758bdf66a3f25fcfdac35b62;hp=58dff236e84c95ef0f7cd761f74e03730da4c478;hpb=2cfbd6edca58330fda80ca9460fec0d66a3791a0;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 58dff236..4519d5c9 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
@@ -65,41 +65,36 @@
                 "type": "object",
                 "description": "Name/value pairs of payload information passed by Policy to the actor",
                 "anyOf": [
+                  {
+                    "title": "User defined",
+                    "properties": {}
+                  },
                   {
                     "title": "resource-assignment",
                     "properties": {
                       "artifact_name": {
-                        "title": "artifact_name",
+                        "title": "artifact name",
                         "type": "string",
                         "default": "baseconfiguration",
-                        "readOnly": "True"
+                        "readOnly": true
                       },
                       "artifact_version": {
-                        "title": "artifact_version",
+                        "title": "artifact version",
                         "type": "string",
                         "default": "1.0.0",
-                        "readOnly": "True"
+                        "readOnly": true
                       },
                       "mode": {
                         "title": "mode",
                         "type": "string",
                         "default": "async",
-                        "readOnly": "True"
+                        "readOnly": false
                       },
                       "data": {
                         "title": "data",
-                        "type": "object",
-                        "properties": {
-                          "resource-assignment-properties": {
-                            "request-id": "",
-                            "service-instance-id": "",
-                            "vnf-id": "",
-                            "action-name": "",
-                            "scope-type": "",
-                            "hostname": "",
-                            "vnf_name": ""
-                          }
-                        }
+                        "type": "string",
+                        "format": "textarea",
+                        "default": "{\"request-id\":\"\",\"service-instance-id\":\"\",\"hostname\":\"\",\"request-info\":{\"prop1\":\"\",\"prop2\":\"\"}}"
                       }
                     }
                   },
@@ -107,37 +102,28 @@
                     "title": "activate",
                     "properties": {
                       "artifact_name": {
-                        "title": "artifact_name",
+                        "title": "artifact name",
                         "type": "string",
                         "default": "baseconfiguration",
-                        "readOnly": "True"
+                        "readOnly": true
                       },
                       "artifact_version": {
-                        "title": "artifact_version",
+                        "title": "artifact version",
                         "type": "string",
                         "default": "1.0.0",
-                        "readOnly": "True"
+                        "readOnly": true
                       },
                       "mode": {
                         "title": "mode",
                         "type": "string",
                         "default": "async",
-                        "readOnly": "True"
+                        "readOnly": false
                       },
                       "data": {
                         "title": "data",
-                        "type": "object",
-                        "properties": {
-                          "resource-assignment-properties": {
-                            "request-id": "",
-                            "service-instance-id": "",
-                            "vnf-id": "",
-                            "action-name": "",
-                            "scope-type": "",
-                            "hostname": "",
-                            "vnf_name": ""
-                          }
-                        }
+                        "type": "string",
+                        "format": "textarea",
+                        "default": "{\"request-id\":\"\",\"service-instance-id\":\"\",\"hostname\":\"\",\"request-info\":{\"prop1\":\"\",\"prop2\":\"\"}}"
                       }
                     }
                   },
@@ -145,37 +131,28 @@
                     "title": "activate-restconf",
                     "properties": {
                       "artifact_name": {
-                        "title": "artifact_name",
+                        "title": "artifact name",
                         "type": "string",
                         "default": "baseconfiguration",
-                        "readOnly": "True"
+                        "readOnly": true
                       },
                       "artifact_version": {
-                        "title": "artifact_version",
+                        "title": "artifact version",
                         "type": "string",
                         "default": "1.0.0",
-                        "readOnly": "True"
+                        "readOnly": true
                       },
                       "mode": {
                         "title": "mode",
                         "type": "string",
                         "default": "async",
-                        "readOnly": "True"
+                        "readOnly": false
                       },
                       "data": {
                         "title": "data",
-                        "type": "object",
-                        "properties": {
-                          "resource-assignment-properties": {
-                            "request-id": "",
-                            "service-instance-id": "",
-                            "vnf-id": "",
-                            "action-name": "",
-                            "scope-type": "",
-                            "hostname": "",
-                            "vnf_name": ""
-                          }
-                        }
+                        "type": "string",
+                        "format": "textarea",
+                        "default": "{\"request-id\":\"\",\"service-instance-id\":\"\",\"hostname\":\"\",\"request-info\":{\"prop1\":\"\",\"prop2\":\"\"}}"
                       }
                     }
                   },
@@ -183,37 +160,28 @@
                     "title": "activate-cli",
                     "properties": {
                       "artifact_name": {
-                        "title": "artifact_name",
+                        "title": "artifact name",
                         "type": "string",
                         "default": "baseconfiguration",
-                        "readOnly": "True"
+                        "readOnly": true
                       },
                       "artifact_version": {
-                        "title": "artifact_version",
+                        "title": "artifact version",
                         "type": "string",
                         "default": "1.0.0",
-                        "readOnly": "True"
+                        "readOnly": true
                       },
                       "mode": {
                         "title": "mode",
                         "type": "string",
                         "default": "async",
-                        "readOnly": "True"
+                        "readOnly": false
                       },
                       "data": {
                         "title": "data",
-                        "type": "object",
-                        "properties": {
-                          "resource-assignment-properties": {
-                            "request-id": "",
-                            "service-instance-id": "",
-                            "vnf-id": "",
-                            "action-name": "",
-                            "scope-type": "",
-                            "hostname": "",
-                            "vnf_name": ""
-                          }
-                        }
+                        "type": "string",
+                        "format": "textarea",
+                        "default": "{\"request-id\":\"\",\"service-instance-id\":\"\",\"hostname\":\"\",\"request-info\":{\"prop1\":\"\",\"prop2\":\"\"}}"
                       }
                     }
                   },
@@ -221,37 +189,28 @@
                     "title": "assign-activate",
                     "properties": {
                       "artifact_name": {
-                        "title": "artifact_name",
+                        "title": "artifact name",
                         "type": "string",
                         "default": "baseconfiguration",
-                        "readOnly": "True"
+                        "readOnly": true
                       },
                       "artifact_version": {
-                        "title": "artifact_version",
+                        "title": "artifact version",
                         "type": "string",
                         "default": "1.0.0",
-                        "readOnly": "True"
+                        "readOnly": true
                       },
                       "mode": {
                         "title": "mode",
                         "type": "string",
                         "default": "async",
-                        "readOnly": "True"
+                        "readOnly": false
                       },
                       "data": {
                         "title": "data",
-                        "type": "object",
-                        "properties": {
-                          "resource-assignment-properties": {
-                            "request-id": "",
-                            "service-instance-id": "",
-                            "vnf-id": "",
-                            "action-name": "",
-                            "scope-type": "",
-                            "hostname": "",
-                            "vnf_name": ""
-                          }
-                        }
+                        "type": "string",
+                        "format": "textarea",
+                        "default": "{\"request-id\":\"\",\"service-instance-id\":\"\",\"hostname\":\"\",\"request-info\":{\"prop1\":\"\",\"prop2\":\"\"}}"
                       }
                     }
                   },
@@ -259,43 +218,30 @@
                     "title": "imperative-test-wf",
                     "properties": {
                       "artifact_name": {
-                        "title": "artifact_name",
+                        "title": "artifact name",
                         "type": "string",
                         "default": "baseconfiguration",
-                        "readOnly": "True"
+                        "readOnly": true
                       },
                       "artifact_version": {
-                        "title": "artifact_version",
+                        "title": "artifact version",
                         "type": "string",
                         "default": "1.0.0",
-                        "readOnly": "True"
+                        "readOnly": true
                       },
                       "mode": {
                         "title": "mode",
                         "type": "string",
                         "default": "async",
-                        "readOnly": "True"
+                        "readOnly": false
                       },
                       "data": {
                         "title": "data",
-                        "type": "object",
-                        "properties": {
-                          "resource-assignment-properties": {
-                            "request-id": "",
-                            "service-instance-id": "",
-                            "vnf-id": "",
-                            "action-name": "",
-                            "scope-type": "",
-                            "hostname": "",
-                            "vnf_name": ""
-                          }
-                        }
+                        "type": "string",
+                        "format": "textarea",
+                        "default": "{\"request-id\":\"\",\"service-instance-id\":\"\",\"hostname\":\"\",\"request-info\":{\"prop1\":\"\",\"prop2\":\"\"}}"
                       }
                     }
-                  },
-                  {
-                    "title": "User defined",
-                    "properties": {}
                   }
                 ]
               },
@@ -311,13 +257,17 @@
                     "type": "object",
                     "description": "Map of values that identify the resource. If none are provided, it is assumed that the\nentity that generated the ONSET event will be the target.\n",
                     "anyOf": [
+                      {
+                        "title": "User defined",
+                        "properties": {}
+                      },
                       {
                         "title": "VNF-vLoadBalancerMS 0",
                         "properties": {
                           "resourceID": {
                             "title": "Resource ID",
                             "type": "string",
-                            "default": "vLoadBalancerMS",
+                            "default": "1a31b9f2-e50d-43b7-89b3-a040250cf506",
                             "readOnly": "True"
                           }
                         }