Fix the DCAE query

[clamp.git] / docs / swagger / swagger.json

diff --git a/docs/swagger/swagger.json b/docs/swagger/swagger.json
index 32113cc..1c6dde1 100644 (file)
--- a/docs/swagger/swagger.json
+++ b/docs/swagger/swagger.json
@@ -1,76 +1,160 @@
 {
   "swagger" : "2.0",
   "info" : {
-    "version" : "4.2.0-SNAPSHOT",
+    "version" : "5.1.3-SNAPSHOT",
     "title" : "Clamp Rest API"
   },
-  "host" : "localhost:33953",
+  "host" : "localhost:8443",
   "basePath" : "/restservices/clds/",
   "schemes" : [ "http" ],
   "paths" : {
-    "/v2/loop/{loopName}" : {
+    "/v2/clampInformation" : {
       "get" : {
-        "operationId" : "route20",
+        "operationId" : "route34",
+        "produces" : [ "application/json" ],
+        "responses" : {
+          "200" : {
+            "description" : "Output type",
+            "schema" : {
+              "$ref" : "#/definitions/ClampInformation"
+            }
+          }
+        },
+        "x-camelContextId" : "camel-1",
+        "x-routeId" : "route34"
+      }
+    },
+    "/v2/dictionary" : {
+      "get" : {
+        "operationId" : "route19",
+        "produces" : [ "application/json" ],
+        "responses" : {
+          "200" : {
+            "description" : "Output type",
+            "schema" : {
+              "$ref" : "#/definitions/Dictionary"
+            }
+          }
+        },
+        "x-camelContextId" : "camel-1",
+        "x-routeId" : "route19"
+      },
+      "put" : {
+        "operationId" : "route22",
+        "consumes" : [ "application/json" ],
         "produces" : [ "application/json" ],
         "parameters" : [ {
-          "name" : "loopName",
-          "in" : "path",
+          "in" : "body",
+          "name" : "body",
           "required" : true,
-          "type" : "string"
+          "schema" : {
+            "$ref" : "#/definitions/Dictionary"
+          }
         } ],
         "responses" : {
           "200" : {
             "description" : "Output type",
             "schema" : {
-              "$ref" : "#/definitions/Loop"
+              "$ref" : "#/definitions/Dictionary"
             }
           }
         },
-        "x-camelContextId" : "camel-2",
-        "x-routeId" : "route20"
+        "x-camelContextId" : "camel-1",
+        "x-routeId" : "route22"
       }
     },
-    "/v2/loop/delete/{loopName}" : {
-      "put" : {
-        "operationId" : "route30",
+    "/v2/dictionary/{dictionaryName}" : {
+      "get" : {
+        "operationId" : "route21",
+        "produces" : [ "application/json" ],
         "parameters" : [ {
-          "name" : "loopName",
+          "name" : "dictionaryName",
           "in" : "path",
           "required" : true,
           "type" : "string"
         } ],
         "responses" : {
-          "200" : { }
+          "200" : {
+            "description" : "Output type",
+            "schema" : {
+              "$ref" : "#/definitions/Dictionary"
+            }
+          }
         },
-        "x-camelContextId" : "camel-2",
-        "x-routeId" : "route30"
+        "x-camelContextId" : "camel-1",
+        "x-routeId" : "route21"
       }
     },
-    "/v2/loop/deploy/{loopName}" : {
+    "/v2/dictionary/{name}" : {
       "put" : {
-        "operationId" : "route25",
+        "operationId" : "route23",
+        "consumes" : [ "application/json" ],
         "produces" : [ "application/json" ],
         "parameters" : [ {
-          "name" : "loopName",
+          "name" : "name",
           "in" : "path",
           "required" : true,
           "type" : "string"
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "required" : true,
+          "schema" : {
+            "$ref" : "#/definitions/Dictionary"
+          }
         } ],
         "responses" : {
           "200" : {
             "description" : "Output type",
             "schema" : {
-              "$ref" : "#/definitions/Loop"
+              "$ref" : "#/definitions/Dictionary"
             }
           }
         },
-        "x-camelContextId" : "camel-2",
+        "x-camelContextId" : "camel-1",
+        "x-routeId" : "route23"
+      },
+      "delete" : {
+        "operationId" : "route24",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "name",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : { }
+        },
+        "x-camelContextId" : "camel-1",
+        "x-routeId" : "route24"
+      }
+    },
+    "/v2/dictionary/{name}/elements/{shortName}" : {
+      "delete" : {
+        "operationId" : "route25",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "name",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "shortName",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : { }
+        },
+        "x-camelContextId" : "camel-1",
         "x-routeId" : "route25"
       }
     },
-    "/v2/loop/getAllNames" : {
+    "/v2/dictionary/secondary/names" : {
       "get" : {
-        "operationId" : "route19",
+        "operationId" : "route20",
         "produces" : [ "application/json" ],
         "responses" : {
           "200" : {
@@ -83,13 +167,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-2",
-        "x-routeId" : "route19"
+        "x-camelContextId" : "camel-1",
+        "x-routeId" : "route20"
       }
     },
-    "/v2/loop/getstatus/{loopName}" : {
+    "/v2/loop/{loopName}" : {
       "get" : {
-        "operationId" : "route31",
+        "operationId" : "route3",
         "produces" : [ "application/json" ],
         "parameters" : [ {
           "name" : "loopName",
@@ -105,19 +189,29 @@
             }
           }
         },
-        "x-camelContextId" : "camel-2",
-        "x-routeId" : "route31"
+        "x-camelContextId" : "camel-1",
+        "x-routeId" : "route3"
       }
     },
-    "/v2/loop/restart/{loopName}" : {
+    "/v2/loop/addOperationaPolicy/{loopName}/policyModel/{policyType}/{policyVersion}" : {
       "put" : {
-        "operationId" : "route28",
+        "operationId" : "route16",
         "produces" : [ "application/json" ],
         "parameters" : [ {
           "name" : "loopName",
           "in" : "path",
           "required" : true,
           "type" : "string"
+        }, {
+          "name" : "policyType",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "policyVersion",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
         } ],
         "responses" : {
           "200" : {
@@ -127,16 +221,17 @@
             }
           }
         },
-        "x-camelContextId" : "camel-2",
-        "x-routeId" : "route28"
+        "x-camelContextId" : "camel-1",
+        "x-routeId" : "route16"
       }
     },
-    "/v2/loop/stop/{loopName}" : {
-      "put" : {
-        "operationId" : "route27",
+    "/v2/loop/create/{loopName}?templateName={templateName}" : {
+      "post" : {
+        "operationId" : "route18",
+        "consumes" : [ "application/json" ],
         "produces" : [ "application/json" ],
         "parameters" : [ {
-          "name" : "loopName",
+          "name" : "loopName}?templateName={templateName",
           "in" : "path",
           "required" : true,
           "type" : "string"
@@ -149,13 +244,29 @@
             }
           }
         },
-        "x-camelContextId" : "camel-2",
-        "x-routeId" : "route27"
+        "x-camelContextId" : "camel-1",
+        "x-routeId" : "route18"
       }
     },
-    "/v2/loop/submit/{loopName}" : {
+    "/v2/loop/delete/{loopName}" : {
       "put" : {
-        "operationId" : "route29",
+        "operationId" : "route14",
+        "parameters" : [ {
+          "name" : "loopName",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : { }
+        },
+        "x-camelContextId" : "camel-1",
+        "x-routeId" : "route14"
+      }
+    },
+    "/v2/loop/deploy/{loopName}" : {
+      "put" : {
+        "operationId" : "route7",
         "produces" : [ "application/json" ],
         "parameters" : [ {
           "name" : "loopName",
@@ -171,14 +282,33 @@
             }
           }
         },
-        "x-camelContextId" : "camel-2",
-        "x-routeId" : "route29"
+        "x-camelContextId" : "camel-1",
+        "x-routeId" : "route7"
       }
     },
-    "/v2/loop/svgRepresentation/{loopName}" : {
+    "/v2/loop/getAllNames" : {
       "get" : {
-        "operationId" : "route21",
-        "produces" : [ "application/xml" ],
+        "operationId" : "route2",
+        "produces" : [ "application/json" ],
+        "responses" : {
+          "200" : {
+            "description" : "Output type",
+            "schema" : {
+              "type" : "array",
+              "items" : {
+                "type" : "string"
+              }
+            }
+          }
+        },
+        "x-camelContextId" : "camel-1",
+        "x-routeId" : "route2"
+      }
+    },
+    "/v2/loop/getstatus/{loopName}" : {
+      "get" : {
+        "operationId" : "route15",
+        "produces" : [ "application/json" ],
         "parameters" : [ {
           "name" : "loopName",
           "in" : "path",
@@ -189,23 +319,28 @@
           "200" : {
             "description" : "Output type",
             "schema" : {
-              "type" : "string"
+              "$ref" : "#/definitions/Loop"
             }
           }
         },
-        "x-camelContextId" : "camel-2",
-        "x-routeId" : "route21"
+        "x-camelContextId" : "camel-1",
+        "x-routeId" : "route15"
       }
     },
-    "/v2/loop/undeploy/{loopName}" : {
+    "/v2/loop/refreshMicroServicePolicyJsonSchema/{loopName}/{microServicePolicyName}" : {
       "put" : {
-        "operationId" : "route26",
+        "operationId" : "route8",
         "produces" : [ "application/json" ],
         "parameters" : [ {
           "name" : "loopName",
           "in" : "path",
           "required" : true,
           "type" : "string"
+        }, {
+          "name" : "microServicePolicyName",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
         } ],
         "responses" : {
           "200" : {
@@ -215,14 +350,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-2",
-        "x-routeId" : "route26"
+        "x-camelContextId" : "camel-1",
+        "x-routeId" : "route8"
       }
     },
-    "/v2/loop/updateGlobalProperties/{loopName}" : {
-      "post" : {
-        "operationId" : "route22",
-        "consumes" : [ "application/json" ],
+    "/v2/loop/refreshOperationalPolicyJsonSchema/{loopName}/{operationalPolicyName}" : {
+      "put" : {
+        "operationId" : "route9",
         "produces" : [ "application/json" ],
         "parameters" : [ {
           "name" : "loopName",
@@ -230,12 +364,10 @@
           "required" : true,
           "type" : "string"
         }, {
-          "in" : "body",
-          "name" : "body",
+          "name" : "operationalPolicyName",
+          "in" : "path",
           "required" : true,
-          "schema" : {
-            "$ref" : "#/definitions/JsonObject"
-          }
+          "type" : "string"
         } ],
         "responses" : {
           "200" : {
@@ -245,14 +377,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-2",
-        "x-routeId" : "route22"
+        "x-camelContextId" : "camel-1",
+        "x-routeId" : "route9"
       }
     },
-    "/v2/loop/updateMicroservicePolicy/{loopName}" : {
-      "post" : {
-        "operationId" : "route24",
-        "consumes" : [ "application/json" ],
+    "/v2/loop/removeOperationaPolicy/{loopName}/policyModel/{policyType}/{policyVersion}/{policyName}" : {
+      "put" : {
+        "operationId" : "route17",
         "produces" : [ "application/json" ],
         "parameters" : [ {
           "name" : "loopName",
@@ -260,42 +391,42 @@
           "required" : true,
           "type" : "string"
         }, {
-          "in" : "body",
-          "name" : "body",
+          "name" : "policyType",
+          "in" : "path",
           "required" : true,
-          "schema" : {
-            "$ref" : "#/definitions/MicroServicePolicy"
-          }
+          "type" : "string"
+        }, {
+          "name" : "policyVersion",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "policyName",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
         } ],
         "responses" : {
           "200" : {
             "description" : "Output type",
             "schema" : {
-              "$ref" : "#/definitions/MicroServicePolicy"
+              "$ref" : "#/definitions/Loop"
             }
           }
         },
-        "x-camelContextId" : "camel-2",
-        "x-routeId" : "route24"
+        "x-camelContextId" : "camel-1",
+        "x-routeId" : "route17"
       }
     },
-    "/v2/loop/updateOperationalPolicies/{loopName}" : {
-      "post" : {
-        "operationId" : "route23",
-        "consumes" : [ "application/json" ],
+    "/v2/loop/restart/{loopName}" : {
+      "put" : {
+        "operationId" : "route12",
         "produces" : [ "application/json" ],
         "parameters" : [ {
           "name" : "loopName",
           "in" : "path",
           "required" : true,
           "type" : "string"
-        }, {
-          "in" : "body",
-          "name" : "body",
-          "required" : true,
-          "schema" : {
-            "$ref" : "#/definitions/JsonArray"
-          }
         } ],
         "responses" : {
           "200" : {
@@ -305,56 +436,400 @@
             }
           }
         },
-        "x-camelContextId" : "camel-2",
-        "x-routeId" : "route23"
+        "x-camelContextId" : "camel-1",
+        "x-routeId" : "route12"
       }
     },
-    "/v1/clds/cldsInfo" : {
-      "get" : {
-        "operationId" : "route32",
+    "/v2/loop/stop/{loopName}" : {
+      "put" : {
+        "operationId" : "route11",
         "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "loopName",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
         "responses" : {
           "200" : {
             "description" : "Output type",
             "schema" : {
-              "$ref" : "#/definitions/CldsInfo"
+              "$ref" : "#/definitions/Loop"
             }
           }
         },
-        "x-camelContextId" : "camel-2",
-        "x-routeId" : "route32"
+        "x-camelContextId" : "camel-1",
+        "x-routeId" : "route11"
       }
     },
-    "/v1/healthcheck" : {
-      "get" : {
-        "operationId" : "route33",
+    "/v2/loop/submit/{loopName}" : {
+      "put" : {
+        "operationId" : "route13",
         "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "loopName",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
         "responses" : {
           "200" : {
             "description" : "Output type",
             "schema" : {
-              "$ref" : "#/definitions/CldsHealthCheck"
+              "$ref" : "#/definitions/Loop"
             }
           }
         },
-        "x-camelContextId" : "camel-2",
-        "x-routeId" : "route33"
+        "x-camelContextId" : "camel-1",
+        "x-routeId" : "route13"
       }
     },
-    "/v1/user/getUser" : {
-      "get" : {
-        "operationId" : "route34",
-        "produces" : [ "text/plain" ],
-        "responses" : {
-          "200" : { }
-        },
-        "x-camelContextId" : "camel-2",
-        "x-routeId" : "route34"
-      }
-    }
-  },
-  "definitions" : {
-    "Loop" : {
+    "/v2/loop/undeploy/{loopName}" : {
+      "put" : {
+        "operationId" : "route10",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "loopName",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "Output type",
+            "schema" : {
+              "$ref" : "#/definitions/Loop"
+            }
+          }
+        },
+        "x-camelContextId" : "camel-1",
+        "x-routeId" : "route10"
+      }
+    },
+    "/v2/loop/updateGlobalProperties/{loopName}" : {
+      "post" : {
+        "operationId" : "route4",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "loopName",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "required" : true,
+          "schema" : {
+            "$ref" : "#/definitions/JsonObject"
+          }
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "Output type",
+            "schema" : {
+              "$ref" : "#/definitions/Loop"
+            }
+          }
+        },
+        "x-camelContextId" : "camel-1",
+        "x-routeId" : "route4"
+      }
+    },
+    "/v2/loop/updateMicroservicePolicy/{loopName}" : {
+      "post" : {
+        "operationId" : "route6",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "loopName",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "required" : true,
+          "schema" : {
+            "$ref" : "#/definitions/MicroServicePolicy"
+          }
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "Output type",
+            "schema" : {
+              "$ref" : "#/definitions/MicroServicePolicy"
+            }
+          }
+        },
+        "x-camelContextId" : "camel-1",
+        "x-routeId" : "route6"
+      }
+    },
+    "/v2/loop/updateOperationalPolicies/{loopName}" : {
+      "post" : {
+        "operationId" : "route5",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "loopName",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "required" : true,
+          "schema" : {
+            "$ref" : "#/definitions/JsonArray"
+          }
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "Output type",
+            "schema" : {
+              "$ref" : "#/definitions/Loop"
+            }
+          }
+        },
+        "x-camelContextId" : "camel-1",
+        "x-routeId" : "route5"
+      }
+    },
+    "/v2/policyToscaModels" : {
+      "get" : {
+        "operationId" : "route26",
+        "produces" : [ "application/json" ],
+        "responses" : {
+          "200" : {
+            "description" : "Output type",
+            "schema" : {
+              "$ref" : "#/definitions/PolicyModel"
+            }
+          }
+        },
+        "x-camelContextId" : "camel-1",
+        "x-routeId" : "route26"
+      },
+      "post" : {
+        "operationId" : "route29",
+        "consumes" : [ "plain/text" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "in" : "body",
+          "name" : "body",
+          "required" : true,
+          "schema" : {
+            "type" : "string"
+          }
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "Output type",
+            "schema" : {
+              "$ref" : "#/definitions/PolicyModel"
+            }
+          }
+        },
+        "x-camelContextId" : "camel-1",
+        "x-routeId" : "route29"
+      }
+    },
+    "/v2/policyToscaModels/{policyModelType}/{policyModelVersion}" : {
+      "get" : {
+        "operationId" : "route27",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "policyModelType",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "policyModelVersion",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "Output type",
+            "schema" : {
+              "$ref" : "#/definitions/PolicyModel"
+            }
+          }
+        },
+        "x-camelContextId" : "camel-1",
+        "x-routeId" : "route27"
+      },
+      "put" : {
+        "operationId" : "route30",
+        "consumes" : [ "plain/text" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "policyModelType",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "policyModelVersion",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "required" : true,
+          "schema" : {
+            "type" : "string"
+          }
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "Output type",
+            "schema" : {
+              "$ref" : "#/definitions/PolicyModel"
+            }
+          }
+        },
+        "x-camelContextId" : "camel-1",
+        "x-routeId" : "route30"
+      }
+    },
+    "/v2/policyToscaModels/yaml/{policyModelType}/{policyModelVersion}" : {
+      "get" : {
+        "operationId" : "route28",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "policyModelType",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "policyModelVersion",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "Output type",
+            "schema" : {
+              "type" : "string"
+            }
+          }
+        },
+        "x-camelContextId" : "camel-1",
+        "x-routeId" : "route28"
+      }
+    },
+    "/v2/templates" : {
+      "get" : {
+        "operationId" : "route31",
+        "produces" : [ "application/json" ],
+        "responses" : {
+          "200" : {
+            "description" : "Output type",
+            "schema" : {
+              "$ref" : "#/definitions/LoopTemplate"
+            }
+          }
+        },
+        "x-camelContextId" : "camel-1",
+        "x-routeId" : "route31"
+      }
+    },
+    "/v2/templates/{templateName}" : {
+      "get" : {
+        "operationId" : "route32",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "templateName",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "Output type",
+            "schema" : {
+              "$ref" : "#/definitions/LoopTemplate"
+            }
+          }
+        },
+        "x-camelContextId" : "camel-1",
+        "x-routeId" : "route32"
+      }
+    },
+    "/v2/templates/names" : {
+      "get" : {
+        "operationId" : "route33",
+        "produces" : [ "application/json" ],
+        "responses" : {
+          "200" : {
+            "description" : "Output type",
+            "schema" : {
+              "type" : "array",
+              "items" : {
+                "type" : "string"
+              }
+            }
+          }
+        },
+        "x-camelContextId" : "camel-1",
+        "x-routeId" : "route33"
+      }
+    },
+    "/v1/healthcheck" : {
+      "get" : {
+        "operationId" : "route35",
+        "produces" : [ "application/json" ],
+        "responses" : {
+          "200" : {
+            "description" : "Output type",
+            "schema" : {
+              "$ref" : "#/definitions/CldsHealthCheck"
+            }
+          }
+        },
+        "x-camelContextId" : "camel-1",
+        "x-routeId" : "route35"
+      }
+    },
+    "/v1/user/getUser" : {
+      "get" : {
+        "operationId" : "route36",
+        "produces" : [ "text/plain" ],
+        "responses" : {
+          "200" : { }
+        },
+        "x-camelContextId" : "camel-1",
+        "x-routeId" : "route36"
+      }
+    }
+  },
+  "definitions" : {
+    "ClampInformation" : {
+      "type" : "object",
+      "properties" : {
+        "userName" : {
+          "type" : "string"
+        },
+        "cldsVersion" : {
+          "type" : "string"
+        },
+        "allPermissions" : {
+          "type" : "array",
+          "items" : {
+            "type" : "string"
+          }
+        }
+      },
+      "x-className" : {
+        "type" : "string",
+        "format" : "org.onap.clamp.clds.model.ClampInformation"
+      }
+    },
+    "Dictionary" : {
       "type" : "object",
       "properties" : {
         "createdDate" : {
@@ -374,16 +849,91 @@
         "name" : {
           "type" : "string"
         },
-        "dcaeDeploymentId" : {
+        "secondLevelDictionary" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "subDictionaryType" : {
           "type" : "string"
         },
-        "dcaeDeploymentStatusUrl" : {
+        "dictionaryElements" : {
+          "type" : "array",
+          "uniqueItems" : true,
+          "items" : {
+            "$ref" : "#/definitions/DictionaryElement"
+          }
+        }
+      },
+      "x-className" : {
+        "type" : "string",
+        "format" : "org.onap.clamp.tosca.Dictionary"
+      }
+    },
+    "DictionaryElement" : {
+      "type" : "object",
+      "properties" : {
+        "createdDate" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "updatedDate" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "updatedBy" : {
           "type" : "string"
         },
-        "dcaeBlueprintId" : {
+        "createdBy" : {
+          "type" : "string"
+        },
+        "shortName" : {
+          "type" : "string"
+        },
+        "name" : {
+          "type" : "string"
+        },
+        "description" : {
+          "type" : "string"
+        },
+        "type" : {
+          "type" : "string"
+        },
+        "subDictionary" : {
+          "type" : "string"
+        },
+        "usedByDictionaries" : {
+          "type" : "array",
+          "uniqueItems" : true,
+          "items" : {
+            "$ref" : "#/definitions/Dictionary"
+          }
+        }
+      }
+    },
+    "Loop" : {
+      "type" : "object",
+      "properties" : {
+        "createdDate" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "updatedDate" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "updatedBy" : {
+          "type" : "string"
+        },
+        "createdBy" : {
+          "type" : "string"
+        },
+        "name" : {
+          "type" : "string"
+        },
+        "dcaeDeploymentId" : {
           "type" : "string"
         },
-        "svgRepresentation" : {
+        "dcaeDeploymentStatusUrl" : {
           "type" : "string"
         },
         "globalPropertiesJson" : {
@@ -392,9 +942,6 @@
         "modelService" : {
           "$ref" : "#/definitions/Service"
         },
-        "blueprint" : {
-          "type" : "string"
-        },
         "lastComputedState" : {
           "type" : "string",
           "enum" : [ "DESIGN", "SUBMITTED", "DEPLOYED", "RUNNING", "STOPPED", "IN_ERROR", "WAITING" ]
@@ -435,49 +982,23 @@
         "format" : "org.onap.clamp.loop.Loop"
       }
     },
-    "MicroServiceModel" : {
+    "JsonPrimitive" : {
       "type" : "object",
       "properties" : {
-        "createdDate" : {
-          "type" : "integer",
-          "format" : "int64"
+        "asBoolean" : {
+          "type" : "boolean"
         },
-        "updatedDate" : {
+        "asInt" : {
           "type" : "integer",
-          "format" : "int64"
-        },
-        "updatedBy" : {
-          "type" : "string"
-        },
-        "createdBy" : {
-          "type" : "string"
-        },
-        "name" : {
-          "type" : "string"
-        },
-        "policyType" : {
-          "type" : "string"
-        },
-        "blueprint" : {
-          "type" : "string"
+          "format" : "int32"
         },
-        "policyModel" : {
-          "$ref" : "#/definitions/PolicyModel"
+        "asDouble" : {
+          "type" : "number",
+          "format" : "double"
         },
-        "usedByLoopTemplates" : {
-          "type" : "array",
-          "uniqueItems" : true,
-          "items" : {
-            "$ref" : "#/definitions/TemplateMicroServiceModel"
-          }
-        }
-      }
-    },
-    "JsonPrimitive" : {
-      "type" : "object",
-      "properties" : {
-        "asBoolean" : {
-          "type" : "boolean"
+        "asLong" : {
+          "type" : "integer",
+          "format" : "int64"
         },
         "boolean" : {
           "type" : "boolean"
@@ -488,25 +1009,23 @@
         "asString" : {
           "type" : "string"
         },
+        "asBigDecimal" : {
+          "type" : "number"
+        },
+        "asBigInteger" : {
+          "type" : "integer"
+        },
+        "asShort" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
         "asNumber" : {
           "$ref" : "#/definitions/Number"
         },
-        "asDouble" : {
-          "type" : "number",
-          "format" : "double"
-        },
         "asFloat" : {
           "type" : "number",
           "format" : "float"
         },
-        "asLong" : {
-          "type" : "integer",
-          "format" : "int64"
-        },
-        "asInt" : {
-          "type" : "integer",
-          "format" : "int32"
-        },
         "asByte" : {
           "type" : "string",
           "format" : "byte"
@@ -514,42 +1033,32 @@
         "asCharacter" : {
           "type" : "string"
         },
-        "asBigDecimal" : {
-          "type" : "number"
-        },
-        "asBigInteger" : {
-          "type" : "integer"
-        },
-        "asShort" : {
-          "type" : "integer",
-          "format" : "int32"
-        },
         "string" : {
           "type" : "boolean"
         },
         "asJsonObject" : {
           "$ref" : "#/definitions/JsonObject"
         },
+        "jsonObject" : {
+          "type" : "boolean"
+        },
         "asJsonArray" : {
           "$ref" : "#/definitions/JsonArray"
         },
-        "asJsonPrimitive" : {
-          "$ref" : "#/definitions/JsonPrimitive"
-        },
         "jsonArray" : {
           "type" : "boolean"
         },
-        "jsonObject" : {
-          "type" : "boolean"
-        },
-        "jsonPrimitive" : {
-          "type" : "boolean"
-        },
         "jsonNull" : {
           "type" : "boolean"
         },
+        "asJsonPrimitive" : {
+          "$ref" : "#/definitions/JsonPrimitive"
+        },
         "asJsonNull" : {
           "$ref" : "#/definitions/JsonNull"
+        },
+        "jsonPrimitive" : {
+          "type" : "boolean"
         }
       }
     },
@@ -570,10 +1079,25 @@
         "createdBy" : {
           "type" : "string"
         },
-        "name" : {
+        "jsonRepresentation" : {
+          "$ref" : "#/definitions/JsonObject"
+        },
+        "configurationsJson" : {
+          "$ref" : "#/definitions/JsonObject"
+        },
+        "loopElementModel" : {
+          "$ref" : "#/definitions/LoopElementModel"
+        },
+        "pdpGroup" : {
+          "type" : "string"
+        },
+        "pdpSubgroup" : {
           "type" : "string"
         },
-        "modelType" : {
+        "policyModel" : {
+          "$ref" : "#/definitions/PolicyModel"
+        },
+        "name" : {
           "type" : "string"
         },
         "context" : {
@@ -582,18 +1106,9 @@
         "deviceTypeScope" : {
           "type" : "string"
         },
-        "properties" : {
-          "$ref" : "#/definitions/JsonObject"
-        },
         "shared" : {
           "type" : "boolean"
         },
-        "policyTosca" : {
-          "type" : "string"
-        },
-        "jsonRepresentation" : {
-          "$ref" : "#/definitions/JsonObject"
-        },
         "usedByLoops" : {
           "type" : "array",
           "uniqueItems" : true,
@@ -601,8 +1116,14 @@
             "$ref" : "#/definitions/Loop"
           }
         },
-        "microServiceModel" : {
-          "$ref" : "#/definitions/MicroServiceModel"
+        "dcaeDeploymentId" : {
+          "type" : "string"
+        },
+        "dcaeDeploymentStatusUrl" : {
+          "type" : "string"
+        },
+        "dcaeBlueprintId" : {
+          "type" : "string"
         }
       },
       "x-className" : {
@@ -616,52 +1137,47 @@
         "asBoolean" : {
           "type" : "boolean"
         },
+        "asInt" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "asDouble" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "asLong" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
         "asJsonObject" : {
           "$ref" : "#/definitions/JsonObject"
         },
         "asString" : {
           "type" : "string"
         },
-        "asJsonArray" : {
-          "$ref" : "#/definitions/JsonArray"
-        },
-        "asJsonPrimitive" : {
-          "$ref" : "#/definitions/JsonPrimitive"
-        },
-        "jsonArray" : {
-          "type" : "boolean"
-        },
         "jsonObject" : {
           "type" : "boolean"
         },
-        "jsonPrimitive" : {
-          "type" : "boolean"
+        "asJsonArray" : {
+          "$ref" : "#/definitions/JsonArray"
         },
-        "jsonNull" : {
-          "type" : "boolean"
+        "asBigDecimal" : {
+          "type" : "number"
         },
-        "asJsonNull" : {
-          "$ref" : "#/definitions/JsonNull"
+        "asBigInteger" : {
+          "type" : "integer"
+        },
+        "asShort" : {
+          "type" : "integer",
+          "format" : "int32"
         },
         "asNumber" : {
           "$ref" : "#/definitions/Number"
         },
-        "asDouble" : {
-          "type" : "number",
-          "format" : "double"
-        },
         "asFloat" : {
           "type" : "number",
           "format" : "float"
         },
-        "asLong" : {
-          "type" : "integer",
-          "format" : "int64"
-        },
-        "asInt" : {
-          "type" : "integer",
-          "format" : "int32"
-        },
         "asByte" : {
           "type" : "string",
           "format" : "byte"
@@ -669,15 +1185,20 @@
         "asCharacter" : {
           "type" : "string"
         },
-        "asBigDecimal" : {
-          "type" : "number"
+        "jsonArray" : {
+          "type" : "boolean"
+        },
+        "jsonNull" : {
+          "type" : "boolean"
         },
-        "asBigInteger" : {
-          "type" : "integer"
+        "asJsonPrimitive" : {
+          "$ref" : "#/definitions/JsonPrimitive"
         },
-        "asShort" : {
-          "type" : "integer",
-          "format" : "int32"
+        "asJsonNull" : {
+          "$ref" : "#/definitions/JsonNull"
+        },
+        "jsonPrimitive" : {
+          "type" : "boolean"
         }
       },
       "x-className" : {
@@ -714,9 +1235,20 @@
         "policyAcronym" : {
           "type" : "string"
         },
-        "policyVariant" : {
-          "type" : "string"
+        "usedByElementModels" : {
+          "type" : "array",
+          "uniqueItems" : true,
+          "items" : {
+            "$ref" : "#/definitions/LoopElementModel"
+          }
+        },
+        "policyPdpGroup" : {
+          "$ref" : "#/definitions/JsonObject"
         }
+      },
+      "x-className" : {
+        "type" : "string",
+        "format" : "org.onap.clamp.loop.template.PolicyModel"
       }
     },
     "Service" : {
@@ -725,6 +1257,12 @@
         "serviceUuid" : {
           "type" : "string"
         },
+        "name" : {
+          "type" : "string"
+        },
+        "version" : {
+          "type" : "string"
+        },
         "serviceDetails" : {
           "$ref" : "#/definitions/JsonObject"
         },
@@ -733,23 +1271,61 @@
         }
       }
     },
+    "LoopTemplateLoopElementModel" : {
+      "type" : "object",
+      "properties" : {
+        "loopTemplate" : {
+          "$ref" : "#/definitions/LoopTemplate"
+        },
+        "loopElementModel" : {
+          "$ref" : "#/definitions/LoopElementModel"
+        },
+        "flowOrder" : {
+          "type" : "integer",
+          "format" : "int32"
+        }
+      }
+    },
     "OperationalPolicy" : {
       "type" : "object",
       "properties" : {
-        "name" : {
+        "createdDate" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "updatedDate" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "updatedBy" : {
+          "type" : "string"
+        },
+        "createdBy" : {
           "type" : "string"
         },
+        "jsonRepresentation" : {
+          "$ref" : "#/definitions/JsonObject"
+        },
         "configurationsJson" : {
           "$ref" : "#/definitions/JsonObject"
         },
-        "loop" : {
-          "$ref" : "#/definitions/Loop"
+        "loopElementModel" : {
+          "$ref" : "#/definitions/LoopElementModel"
+        },
+        "pdpGroup" : {
+          "type" : "string"
+        },
+        "pdpSubgroup" : {
+          "type" : "string"
         },
         "policyModel" : {
           "$ref" : "#/definitions/PolicyModel"
         },
-        "jsonRepresentation" : {
-          "$ref" : "#/definitions/JsonObject"
+        "name" : {
+          "type" : "string"
+        },
+        "loop" : {
+          "$ref" : "#/definitions/Loop"
         }
       }
     },
@@ -759,52 +1335,47 @@
         "asBoolean" : {
           "type" : "boolean"
         },
+        "asInt" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "asDouble" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "asLong" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
         "asJsonObject" : {
           "$ref" : "#/definitions/JsonObject"
         },
         "asString" : {
           "type" : "string"
         },
-        "asJsonArray" : {
-          "$ref" : "#/definitions/JsonArray"
-        },
-        "asJsonPrimitive" : {
-          "$ref" : "#/definitions/JsonPrimitive"
-        },
-        "jsonArray" : {
-          "type" : "boolean"
-        },
         "jsonObject" : {
           "type" : "boolean"
         },
-        "jsonPrimitive" : {
-          "type" : "boolean"
+        "asJsonArray" : {
+          "$ref" : "#/definitions/JsonArray"
         },
-        "jsonNull" : {
-          "type" : "boolean"
+        "asBigDecimal" : {
+          "type" : "number"
         },
-        "asJsonNull" : {
-          "$ref" : "#/definitions/JsonNull"
+        "asBigInteger" : {
+          "type" : "integer"
+        },
+        "asShort" : {
+          "type" : "integer",
+          "format" : "int32"
         },
         "asNumber" : {
           "$ref" : "#/definitions/Number"
         },
-        "asDouble" : {
-          "type" : "number",
-          "format" : "double"
-        },
         "asFloat" : {
           "type" : "number",
           "format" : "float"
         },
-        "asLong" : {
-          "type" : "integer",
-          "format" : "int64"
-        },
-        "asInt" : {
-          "type" : "integer",
-          "format" : "int32"
-        },
         "asByte" : {
           "type" : "string",
           "format" : "byte"
@@ -812,15 +1383,20 @@
         "asCharacter" : {
           "type" : "string"
         },
-        "asBigDecimal" : {
-          "type" : "number"
+        "jsonArray" : {
+          "type" : "boolean"
         },
-        "asBigInteger" : {
-          "type" : "integer"
+        "jsonNull" : {
+          "type" : "boolean"
         },
-        "asShort" : {
-          "type" : "integer",
-          "format" : "int32"
+        "asJsonPrimitive" : {
+          "$ref" : "#/definitions/JsonPrimitive"
+        },
+        "asJsonNull" : {
+          "$ref" : "#/definitions/JsonNull"
+        },
+        "jsonPrimitive" : {
+          "type" : "boolean"
         }
       }
     },
@@ -830,33 +1406,19 @@
         "asBoolean" : {
           "type" : "boolean"
         },
-        "asString" : {
-          "type" : "string"
-        },
-        "asNumber" : {
-          "$ref" : "#/definitions/Number"
+        "asInt" : {
+          "type" : "integer",
+          "format" : "int32"
         },
         "asDouble" : {
           "type" : "number",
           "format" : "double"
         },
-        "asFloat" : {
-          "type" : "number",
-          "format" : "float"
-        },
         "asLong" : {
           "type" : "integer",
           "format" : "int64"
         },
-        "asInt" : {
-          "type" : "integer",
-          "format" : "int32"
-        },
-        "asByte" : {
-          "type" : "string",
-          "format" : "byte"
-        },
-        "asCharacter" : {
+        "asString" : {
           "type" : "string"
         },
         "asBigDecimal" : {
@@ -869,29 +1431,43 @@
           "type" : "integer",
           "format" : "int32"
         },
-        "asJsonObject" : {
-          "$ref" : "#/definitions/JsonObject"
+        "asNumber" : {
+          "$ref" : "#/definitions/Number"
         },
-        "asJsonArray" : {
-          "$ref" : "#/definitions/JsonArray"
+        "asFloat" : {
+          "type" : "number",
+          "format" : "float"
         },
-        "asJsonPrimitive" : {
-          "$ref" : "#/definitions/JsonPrimitive"
+        "asByte" : {
+          "type" : "string",
+          "format" : "byte"
         },
-        "jsonArray" : {
-          "type" : "boolean"
+        "asCharacter" : {
+          "type" : "string"
+        },
+        "asJsonObject" : {
+          "$ref" : "#/definitions/JsonObject"
         },
         "jsonObject" : {
           "type" : "boolean"
         },
-        "jsonPrimitive" : {
+        "asJsonArray" : {
+          "$ref" : "#/definitions/JsonArray"
+        },
+        "jsonArray" : {
           "type" : "boolean"
         },
         "jsonNull" : {
           "type" : "boolean"
         },
+        "asJsonPrimitive" : {
+          "$ref" : "#/definitions/JsonPrimitive"
+        },
         "asJsonNull" : {
           "$ref" : "#/definitions/JsonNull"
+        },
+        "jsonPrimitive" : {
+          "type" : "boolean"
         }
       },
       "x-className" : {
@@ -925,21 +1501,6 @@
         }
       }
     },
-    "TemplateMicroServiceModel" : {
-      "type" : "object",
-      "properties" : {
-        "loopTemplate" : {
-          "$ref" : "#/definitions/LoopTemplate"
-        },
-        "microServiceModel" : {
-          "$ref" : "#/definitions/MicroServiceModel"
-        },
-        "flowOrder" : {
-          "type" : "integer",
-          "format" : "int32"
-        }
-      }
-    },
     "Number" : {
       "type" : "object"
     },
@@ -974,17 +1535,17 @@
         "name" : {
           "type" : "string"
         },
-        "blueprint" : {
+        "dcaeBlueprintId" : {
           "type" : "string"
         },
-        "svgRepresentation" : {
+        "blueprint" : {
           "type" : "string"
         },
-        "microServiceModelUsed" : {
+        "loopElementModelsUsed" : {
           "type" : "array",
           "uniqueItems" : true,
           "items" : {
-            "$ref" : "#/definitions/TemplateMicroServiceModel"
+            "$ref" : "#/definitions/LoopTemplateLoopElementModel"
           }
         },
         "modelService" : {
@@ -993,7 +1554,18 @@
         "maximumInstancesAllowed" : {
           "type" : "integer",
           "format" : "int32"
+        },
+        "uniqueBlueprint" : {
+          "type" : "boolean"
+        },
+        "allowedLoopType" : {
+          "type" : "string",
+          "enum" : [ "OPEN", "CLOSED", "HYBRID" ]
         }
+      },
+      "x-className" : {
+        "type" : "string",
+        "format" : "org.onap.clamp.loop.template.LoopTemplate"
       }
     },
     "ExternalComponentState" : {
@@ -1011,37 +1583,52 @@
         }
       }
     },
-    "CldsInfo" : {
+    "LoopElementModel" : {
       "type" : "object",
       "properties" : {
-        "userName" : {
+        "createdDate" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "updatedDate" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "updatedBy" : {
           "type" : "string"
         },
-        "cldsVersion" : {
+        "createdBy" : {
           "type" : "string"
         },
-        "permissionReadCl" : {
-          "type" : "boolean"
+        "name" : {
+          "type" : "string"
         },
-        "permissionUpdateCl" : {
-          "type" : "boolean"
+        "dcaeBlueprintId" : {
+          "type" : "string"
         },
-        "permissionReadTemplate" : {
-          "type" : "boolean"
+        "blueprint" : {
+          "type" : "string"
         },
-        "permissionUpdateTemplate" : {
-          "type" : "boolean"
+        "loopElementType" : {
+          "type" : "string"
         },
-        "permissionReadTosca" : {
-          "type" : "boolean"
+        "shortName" : {
+          "type" : "string"
         },
-        "permissionUpdateTosca" : {
-          "type" : "boolean"
+        "policyModels" : {
+          "type" : "array",
+          "uniqueItems" : true,
+          "items" : {
+            "$ref" : "#/definitions/PolicyModel"
+          }
+        },
+        "usedByLoopTemplates" : {
+          "type" : "array",
+          "uniqueItems" : true,
+          "items" : {
+            "$ref" : "#/definitions/LoopTemplateLoopElementModel"
+          }
         }
-      },
-      "x-className" : {
-        "type" : "string",
-        "format" : "org.onap.clamp.clds.model.CldsInfo"
       }
     },
     "CldsHealthCheck" : {