Merge "Payload is expected as string in operational policy"

1 files changed, 168 insertions, 204 deletions

diff --git a/src/test/resources/tosca/operational-policy-json-schema.json b/src/test/resources/tosca/operational-policy-json-schema.json
index 87457f1d2..9dee089e0 100644
--- a/src/test/resources/tosca/operational-policy-json-schema.json
+++ b/src/test/resources/tosca/operational-policy-json-schema.json
@@ -258,7 +258,7 @@
                                 }
                               },
                               "payload": {
-                                "title": "Payload (YAML)",
+                                "title": "Payload",
                                 "type": "object",
                                 "properties": {
                                   "artifact_name": {
@@ -281,39 +281,33 @@
                                   "data": {
                                     "title": "data",
                                     "properties": {
-                                      "resource-assignment-properties": {
-                                        "title": "resource-assignment-properties",
-                                        "type": "object",
-                                        "properties": {
-                                          "request-id": {
-                                            "title": "request-id",
-                                            "type": "string"
-                                          },
-                                          "service-instance-id": {
-                                            "title": "service-instance-id",
-                                            "type": "string"
-                                          },
-                                          "vnf-id": {
-                                            "title": "vnf-id",
-                                            "type": "string"
-                                          },
-                                          "action-name": {
-                                            "title": "action-name",
-                                            "type": "string"
-                                          },
-                                          "scope-type": {
-                                            "title": "scope-type",
-                                            "type": "string"
-                                          },
-                                          "hostname": {
-                                            "title": "hostname",
-                                            "type": "string"
-                                          },
-                                          "vnf_name": {
-                                            "title": "vnf_name",
-                                            "type": "string"
-                                          }
-                                        }
+                                      "request-id": {
+                                        "title": "request-id",
+                                        "type": "string"
+                                      },
+                                      "service-instance-id": {
+                                        "title": "service-instance-id",
+                                        "type": "string"
+                                      },
+                                      "vnf-id": {
+                                        "title": "vnf-id",
+                                        "type": "string"
+                                      },
+                                      "action-name": {
+                                        "title": "action-name",
+                                        "type": "string"
+                                      },
+                                      "scope-type": {
+                                        "title": "scope-type",
+                                        "type": "string"
+                                      },
+                                      "hostname": {
+                                        "title": "hostname",
+                                        "type": "string"
+                                      },
+                                      "vnf_name": {
+                                        "title": "vnf_name",
+                                        "type": "string"
                                       }
                                     }
                                   }
@@ -334,7 +328,7 @@
                                 }
                               },
                               "payload": {
-                                "title": "Payload (YAML)",
+                                "title": "Payload",
                                 "type": "object",
                                 "properties": {
                                   "artifact_name": {
@@ -357,39 +351,33 @@
                                   "data": {
                                     "title": "data",
                                     "properties": {
-                                      "resource-assignment-properties": {
-                                        "title": "resource-assignment-properties",
-                                        "type": "object",
-                                        "properties": {
-                                          "request-id": {
-                                            "title": "request-id",
-                                            "type": "string"
-                                          },
-                                          "service-instance-id": {
-                                            "title": "service-instance-id",
-                                            "type": "string"
-                                          },
-                                          "vnf-id": {
-                                            "title": "vnf-id",
-                                            "type": "string"
-                                          },
-                                          "action-name": {
-                                            "title": "action-name",
-                                            "type": "string"
-                                          },
-                                          "scope-type": {
-                                            "title": "scope-type",
-                                            "type": "string"
-                                          },
-                                          "hostname": {
-                                            "title": "hostname",
-                                            "type": "string"
-                                          },
-                                          "vnf_name": {
-                                            "title": "vnf_name",
-                                            "type": "string"
-                                          }
-                                        }
+                                      "request-id": {
+                                        "title": "request-id",
+                                        "type": "string"
+                                      },
+                                      "service-instance-id": {
+                                        "title": "service-instance-id",
+                                        "type": "string"
+                                      },
+                                      "vnf-id": {
+                                        "title": "vnf-id",
+                                        "type": "string"
+                                      },
+                                      "action-name": {
+                                        "title": "action-name",
+                                        "type": "string"
+                                      },
+                                      "scope-type": {
+                                        "title": "scope-type",
+                                        "type": "string"
+                                      },
+                                      "hostname": {
+                                        "title": "hostname",
+                                        "type": "string"
+                                      },
+                                      "vnf_name": {
+                                        "title": "vnf_name",
+                                        "type": "string"
                                       }
                                     }
                                   }
@@ -410,7 +398,7 @@
                                 }
                               },
                               "payload": {
-                                "title": "Payload (YAML)",
+                                "title": "Payload",
                                 "type": "object",
                                 "properties": {
                                   "artifact_name": {
@@ -433,39 +421,33 @@
                                   "data": {
                                     "title": "data",
                                     "properties": {
-                                      "resource-assignment-properties": {
-                                        "title": "resource-assignment-properties",
-                                        "type": "object",
-                                        "properties": {
-                                          "request-id": {
-                                            "title": "request-id",
-                                            "type": "string"
-                                          },
-                                          "service-instance-id": {
-                                            "title": "service-instance-id",
-                                            "type": "string"
-                                          },
-                                          "vnf-id": {
-                                            "title": "vnf-id",
-                                            "type": "string"
-                                          },
-                                          "action-name": {
-                                            "title": "action-name",
-                                            "type": "string"
-                                          },
-                                          "scope-type": {
-                                            "title": "scope-type",
-                                            "type": "string"
-                                          },
-                                          "hostname": {
-                                            "title": "hostname",
-                                            "type": "string"
-                                          },
-                                          "vnf_name": {
-                                            "title": "vnf_name",
-                                            "type": "string"
-                                          }
-                                        }
+                                      "request-id": {
+                                        "title": "request-id",
+                                        "type": "string"
+                                      },
+                                      "service-instance-id": {
+                                        "title": "service-instance-id",
+                                        "type": "string"
+                                      },
+                                      "vnf-id": {
+                                        "title": "vnf-id",
+                                        "type": "string"
+                                      },
+                                      "action-name": {
+                                        "title": "action-name",
+                                        "type": "string"
+                                      },
+                                      "scope-type": {
+                                        "title": "scope-type",
+                                        "type": "string"
+                                      },
+                                      "hostname": {
+                                        "title": "hostname",
+                                        "type": "string"
+                                      },
+                                      "vnf_name": {
+                                        "title": "vnf_name",
+                                        "type": "string"
                                       }
                                     }
                                   }
@@ -486,7 +468,7 @@
                                 }
                               },
                               "payload": {
-                                "title": "Payload (YAML)",
+                                "title": "Payload",
                                 "type": "object",
                                 "properties": {
                                   "artifact_name": {
@@ -509,39 +491,33 @@
                                   "data": {
                                     "title": "data",
                                     "properties": {
-                                      "resource-assignment-properties": {
-                                        "title": "resource-assignment-properties",
-                                        "type": "object",
-                                        "properties": {
-                                          "request-id": {
-                                            "title": "request-id",
-                                            "type": "string"
-                                          },
-                                          "service-instance-id": {
-                                            "title": "service-instance-id",
-                                            "type": "string"
-                                          },
-                                          "vnf-id": {
-                                            "title": "vnf-id",
-                                            "type": "string"
-                                          },
-                                          "action-name": {
-                                            "title": "action-name",
-                                            "type": "string"
-                                          },
-                                          "scope-type": {
-                                            "title": "scope-type",
-                                            "type": "string"
-                                          },
-                                          "hostname": {
-                                            "title": "hostname",
-                                            "type": "string"
-                                          },
-                                          "vnf_name": {
-                                            "title": "vnf_name",
-                                            "type": "string"
-                                          }
-                                        }
+                                      "request-id": {
+                                        "title": "request-id",
+                                        "type": "string"
+                                      },
+                                      "service-instance-id": {
+                                        "title": "service-instance-id",
+                                        "type": "string"
+                                      },
+                                      "vnf-id": {
+                                        "title": "vnf-id",
+                                        "type": "string"
+                                      },
+                                      "action-name": {
+                                        "title": "action-name",
+                                        "type": "string"
+                                      },
+                                      "scope-type": {
+                                        "title": "scope-type",
+                                        "type": "string"
+                                      },
+                                      "hostname": {
+                                        "title": "hostname",
+                                        "type": "string"
+                                      },
+                                      "vnf_name": {
+                                        "title": "vnf_name",
+                                        "type": "string"
                                       }
                                     }
                                   }
@@ -562,7 +538,7 @@
                                 }
                               },
                               "payload": {
-                                "title": "Payload (YAML)",
+                                "title": "Payload",
                                 "type": "object",
                                 "properties": {
                                   "artifact_name": {
@@ -585,39 +561,33 @@
                                   "data": {
                                     "title": "data",
                                     "properties": {
-                                      "resource-assignment-properties": {
-                                        "title": "resource-assignment-properties",
-                                        "type": "object",
-                                        "properties": {
-                                          "request-id": {
-                                            "title": "request-id",
-                                            "type": "string"
-                                          },
-                                          "service-instance-id": {
-                                            "title": "service-instance-id",
-                                            "type": "string"
-                                          },
-                                          "vnf-id": {
-                                            "title": "vnf-id",
-                                            "type": "string"
-                                          },
-                                          "action-name": {
-                                            "title": "action-name",
-                                            "type": "string"
-                                          },
-                                          "scope-type": {
-                                            "title": "scope-type",
-                                            "type": "string"
-                                          },
-                                          "hostname": {
-                                            "title": "hostname",
-                                            "type": "string"
-                                          },
-                                          "vnf_name": {
-                                            "title": "vnf_name",
-                                            "type": "string"
-                                          }
-                                        }
+                                      "request-id": {
+                                        "title": "request-id",
+                                        "type": "string"
+                                      },
+                                      "service-instance-id": {
+                                        "title": "service-instance-id",
+                                        "type": "string"
+                                      },
+                                      "vnf-id": {
+                                        "title": "vnf-id",
+                                        "type": "string"
+                                      },
+                                      "action-name": {
+                                        "title": "action-name",
+                                        "type": "string"
+                                      },
+                                      "scope-type": {
+                                        "title": "scope-type",
+                                        "type": "string"
+                                      },
+                                      "hostname": {
+                                        "title": "hostname",
+                                        "type": "string"
+                                      },
+                                      "vnf_name": {
+                                        "title": "vnf_name",
+                                        "type": "string"
                                       }
                                     }
                                   }
@@ -638,7 +608,7 @@
                                 }
                               },
                               "payload": {
-                                "title": "Payload (YAML)",
+                                "title": "Payload",
                                 "type": "object",
                                 "properties": {
                                   "artifact_name": {
@@ -661,39 +631,33 @@
                                   "data": {
                                     "title": "data",
                                     "properties": {
-                                      "resource-assignment-properties": {
-                                        "title": "resource-assignment-properties",
-                                        "type": "object",
-                                        "properties": {
-                                          "request-id": {
-                                            "title": "request-id",
-                                            "type": "string"
-                                          },
-                                          "service-instance-id": {
-                                            "title": "service-instance-id",
-                                            "type": "string"
-                                          },
-                                          "vnf-id": {
-                                            "title": "vnf-id",
-                                            "type": "string"
-                                          },
-                                          "action-name": {
-                                            "title": "action-name",
-                                            "type": "string"
-                                          },
-                                          "scope-type": {
-                                            "title": "scope-type",
-                                            "type": "string"
-                                          },
-                                          "hostname": {
-                                            "title": "hostname",
-                                            "type": "string"
-                                          },
-                                          "vnf_name": {
-                                            "title": "vnf_name",
-                                            "type": "string"
-                                          }
-                                        }
+                                      "request-id": {
+                                        "title": "request-id",
+                                        "type": "string"
+                                      },
+                                      "service-instance-id": {
+                                        "title": "service-instance-id",
+                                        "type": "string"
+                                      },
+                                      "vnf-id": {
+                                        "title": "vnf-id",
+                                        "type": "string"
+                                      },
+                                      "action-name": {
+                                        "title": "action-name",
+                                        "type": "string"
+                                      },
+                                      "scope-type": {
+                                        "title": "scope-type",
+                                        "type": "string"
+                                      },
+                                      "hostname": {
+                                        "title": "hostname",
+                                        "type": "string"
+                                      },
+                                      "vnf_name": {
+                                        "title": "vnf_name",
+                                        "type": "string"
                                       }
                                     }
                                   }