Add kafka streams to component spec schema

Issue-ID: DCAEGEN2-1179
Signed-off-by: Remigiusz Janeczek <remigiusz.janeczek@nokia.com>
Change-Id: Ie5084f348531e0608e6af7e58c6c2760d617feae

5 files changed, 37 insertions, 1082 deletions

diff --git a/mod/component-json-schemas/component-specification/dcae-cli-v2/component-spec-schema.json b/mod/component-json-schemas/component-specification/dcae-cli-v2/component-spec-schema.json
index 63032cb..7d576c0 100644
--- a/mod/component-json-schemas/component-specification/dcae-cli-v2/component-spec-schema.json
+++ b/mod/component-json-schemas/component-specification/dcae-cli-v2/component-spec-schema.json
@@ -40,7 +40,8 @@
             "oneOf": [
               { "$ref": "#/definitions/publisher_http" },
               { "$ref": "#/definitions/publisher_message_router" },
-              { "$ref": "#/definitions/publisher_data_router" }
+              { "$ref": "#/definitions/publisher_data_router" },
+              { "$ref": "#/definitions/publisher_kafka" }
             ]
           }
         },
@@ -51,7 +52,8 @@
             "oneOf": [
               { "$ref": "#/definitions/subscriber_http" },
               { "$ref": "#/definitions/subscriber_message_router" },
-              { "$ref": "#/definitions/subscriber_data_router" }
+              { "$ref": "#/definitions/subscriber_data_router" },
+              { "$ref": "#/definitions/subscriber_kafka" }
             ]
           }
         }
@@ -470,6 +472,33 @@
         "type"
       ]
     },
+    "stream_kafka": {
+      "type": "object",
+      "properties": {
+        "format": {
+          "$ref": "#/definitions/name"
+        },
+        "version": {
+          "$ref": "#/definitions/version"
+        },
+        "config_key": {
+          "type": "string"
+        },
+        "type": {
+          "description": "Type of stream to be used",
+          "type": "string",
+          "enum": [
+            "kafka"
+          ]
+        }
+      },
+      "required": [
+        "format",
+        "version",
+        "config_key",
+        "type"
+      ]
+    },
     "publisher_http": {
       "type": "object",
       "properties": {
@@ -528,6 +557,9 @@
         "type"
       ]
     },
+    "publisher_kafka": {
+      "$ref": "#/definitions/stream_kafka"
+    },
     "subscriber_http": {
       "type": "object",
       "properties": {
@@ -591,6 +623,9 @@
         "config_key"
       ]
     },
+    "subscriber_kafka": {
+      "$ref": "#/definitions/stream_kafka"
+    },
     "provider" : {
       "oneOf" : [
         {"$ref": "#/definitions/docker-provider"},
diff --git a/mod/component-json-schemas/dcae-cli-v3-draft/component-spec-schema.json b/mod/component-json-schemas/dcae-cli-v3-draft/component-spec-schema.json
deleted file mode 100644
index c97d42f..0000000
--- a/mod/component-json-schemas/dcae-cli-v3-draft/component-spec-schema.json
+++ /dev/null
@@ -1,892 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-04/schema#",,
-  "title": "Component specification schema",
-  "type": "object",
-  "properties": {
-    "self": {
-      "type": "object",
-      "properties": {
-        "version": {
-          "$ref": "#/definitions/version"
-        },
-        "description": {
-          "type": "string"
-        },
-        "component_type": {
-          "type": "string",
-          "enum": [
-            "docker",
-            "cdap"
-          ]
-        },
-        "name": {
-          "$ref": "#/definitions/name"
-        }
-      },
-      "required": [
-        "version",
-        "name",
-        "description",
-        "component_type"
-      ]
-    },
-    "streams": {
-      "type": "object",
-      "properties": {
-        "publishes": {
-          "type": "array",
-          "uniqueItems": true,
-          "items": {
-            "oneOf": [
-                { "$ref": "#/definitions/publisher_http" },
-                { "$ref": "#/definitions/publisher_message_router" },
-                { "$ref": "#/definitions/publisher_data_router" },
-                { "$ref": "#/definitions/publisher_kafka" }
-            ]
-          }
-        },
-        "subscribes": {
-          "type": "array",
-          "uniqueItems": true,
-          "items": {
-            "oneOf": [
-                { "$ref": "#/definitions/subscriber_http" },
-                { "$ref": "#/definitions/subscriber_message_router" },
-                { "$ref": "#/definitions/subscriber_data_router" },
-                { "$ref": "#/definitions/subscriber_kafka" }
-            ]
-          }
-        }
-      },
-      "required": [
-        "publishes",
-        "subscribes"
-      ]
-    },
-    "services": {
-      "type": "object",
-      "properties": {
-        "calls": {
-          "type": "array",
-          "uniqueItems": true,
-          "items": {
-            "$ref": "#/definitions/caller"
-          }
-        },
-        "provides": {
-          "type": "array",
-          "uniqueItems": true,
-          "items": {
-            "$ref": "#/definitions/provider"
-          }
-        }
-      },
-      "required": [
-        "calls",
-        "provides"
-      ]
-    },
-   "parameters" : {
-      "anyOf" : [
-        {"$ref": "#/definitions/docker-parameters"},
-        {"$ref": "#/definitions/cdap-parameters"}
-      ]
-    },
-    "auxilary": {
-      "oneOf" : [
-        {"$ref": "#/definitions/auxilary_cdap"},
-        {"$ref": "#/definitions/auxilary_docker"}
-      ]
-    },
-    "artifacts": {
-      "type": "array",
-      "description": "List of component artifacts",
-      "items": {
-        "$ref": "#/definitions/artifact"
-      }
-    }
-  },
-  "required": [
-    "self",
-    "streams",
-    "services",
-    "parameters",
-    "auxilary",
-    "artifacts"
-  ],
-  "additionalProperties": false,
-  "definitions": {
-    "cdap-parameters": {
-      "description" : "There are three seperate ways to pass parameters to CDAP: app config, app preferences, program preferences. These are all treated as optional.",
-      "type": "object",
-      "properties" : {
-        "program_preferences": {
-          "description" : "A list of {program_id, program_type, program_preference} objects where program_preference is an object passed into program_id of type program_type",
-          "type": "array",
-          "uniqueItems": true,
-          "items": {
-            "$ref": "#/definitions/program_preference"
-          }
-        },
-        "app_preferences" : {
-          "description" : "Parameters Passed down to the CDAP preference API",
-          "type": "array",
-            "uniqueItems": true,
-            "items": {
-              "$ref": "#/definitions/parameter"
-            }
-        },
-        "app_config" : {
-          "description" : "Parameters Passed down to the CDAP App Config",
-          "type": "array",
-            "uniqueItems": true,
-            "items": {
-              "$ref": "#/definitions/parameter"
-            }
-        }
-      }
-    },
-    "program_preference": {
-      "type": "object",
-      "properties": {
-        "program_type": {
-          "$ref": "#/definitions/program_type"
-        },
-        "program_id": {
-          "type": "string"
-        },
-        "program_pref":{
-          "description" : "Parameters that the CDAP developer wants pushed to this program's preferences API. Optional",
-            "type": "array",
-            "uniqueItems": true,
-            "items": {
-              "$ref": "#/definitions/parameter"
-            }
-        }
-      },
-      "required": ["program_type", "program_id", "program_pref"]
-    },
-    "program_type": {
-      "type": "string",
-      "enum": ["flows","mapreduce","schedules","spark","workflows","workers","services"]
-    },
-    "docker-parameters": {
-      "type": "array",
-      "uniqueItems": true,
-      "items": {
-        "$ref": "#/definitions/parameter"
-      }
-    },
-    "parameter": {
-      "oneOf": [
-         {"$ref": "#/definitions/parameter-list"},
-         {"$ref": "#/definitions/parameter-other"}
-      ]
-    },
-    "parameter-list": {
-      "properties": {
-        "name": {
-          "type": "string"
-        },
-        "value": {
-          "description": "Default value for the parameter"
-        },
-        "description": {
-          "description": "Description for the parameter.",
-          "type": "string"
-        },
-        "type": {
-          "description": "Only valid type is list, the entry_schema is required - which contains the type of the list element. All properties set for the parameter apply to all elements in the list at this time",
-          "type": "string",
-          "enum": ["list"]
-        },
-        "required": {
-          "description": "An optional key that declares a parameter as required (true) or not (false). Default is true.",
-          "type": "boolean",
-          "default": true
-        },
-        "constraints": {
-          "description": "The optional list of sequenced constraint clauses for the parameter.",
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/parameter-constraints"
-          }
-        },
-        "entry_schema": {
-            "description": "The optional property used to declare the name of the Datatype definition for entries of certain types. entry_schema must be defined when the type is list.  This is the only type it is currently supported for.",
-                "type": "object",
-                "uniqueItems": true,
-                "items": {"$ref": "#/definitions/list-parameter"}
-        },
-        "designer_editable": {
-          "description": "A required property that declares a parameter as editable by designer in SDC Tool (true) or not (false).",
-          "type": "boolean"
-        },
-        "sourced_at_deployment": {
-          "description": "A required property that declares that a parameter is assigned at deployment time (true) or not (false).",
-          "type": "boolean"
-        },
-        "policy_editable": {
-          "description": "A required property that declares a parameter as editable by DevOps in Policy UI (true) or not (false).",
-          "type": "boolean"
-        },
-        "policy_group": {
-          "description": "An optional property used to group policy_editable parameters into groups. Each group will become it's own policy model. Any parameters without this property will be grouped together to form their own policy model",
-          "type": "string"
-        },
-        "policy_schema" :{
-          "type": "array",
-          "uniqueItems": true,
-          "items": {"$ref": "#/definitions/policy_schema_parameter"}
-        }
-      },
-      "required": [
-        "name",
-        "value",
-        "description",
-        "designer_editable",
-        "policy_editable",
-        "sourced_at_deployment",
-        "entry_schema"
-      ],
-      "additionalProperties": false,
-      "dependencies": {
-        "policy_schema": ["policy_editable"]
-      }
-    },
-    "parameter-other": {
-      "properties": {
-        "name": {
-          "type": "string"
-        },
-        "value": {
-          "description": "Default value for the parameter"
-        },
-        "description": {
-          "description": "Description for the parameter.",
-          "type": "string"
-        },
-        "type": {
-          "description": "The required data type for the parameter.",
-          "type": "string",
-          "enum": [ "string", "number", "boolean", "datetime" ]
-        },
-        "required": {
-          "description": "An optional key that declares a parameter as required (true) or not (false). Default is true.",
-          "type": "boolean",
-          "default": true
-        },
-        "constraints": {
-          "description": "The optional list of sequenced constraint clauses for the parameter.",
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/parameter-constraints"
-          }
-        },
-        "designer_editable": {
-          "description": "A required property that declares a parameter as editable by designer in SDC Tool (true) or not (false).",
-          "type": "boolean"
-        },
-        "sourced_at_deployment": {
-          "description": "A required property that declares that a parameter is assigned at deployment time (true) or not (false).",
-          "type": "boolean"
-        },
-        "policy_editable": {
-          "description": "A required property that declares a parameter as editable in Policy UI (true) or not (false).",
-          "type": "boolean"
-        },
-        "policy_group": {
-          "description": "An optional property used to group policy_editable parameters into groups. Each group will become it's own policy model. Any parameters without this property will be grouped together to form their own policy model",
-          "type": "string"
-        },
-        "policy_schema" :{
-          "description": "An optional property used to define policy_editable parameters as lists or maps",
-          "type": "array",
-          "uniqueItems": true,
-          "items": {"$ref": "#/definitions/policy_schema_parameter"}
-        }
-      },
-      "required": [
-        "name",
-        "value",
-        "description",
-        "designer_editable",
-        "sourced_at_deployment",
-        "policy_editable"
-      ],
-      "additionalProperties": false,
-      "dependencies": {
-        "policy_schema": ["policy_editable"]
-      }
-    },
-    "list-parameter": {
-      "type": "object",
-      "properties": {
-        "type": {
-          "description": "The required data type for each parameter in the list.",
-          "type": "string",
-          "enum": ["string", "number"]
-        }
-      },
-      "required": [
-        "type"
-      ],
-      "additionalProperties": false
-    },
-    "policy_schema_parameter": {
-        "type": "object",
-        "properties": {
-            "name": {
-                "type": "string"
-            },
-            "value": {
-                "description": "Default value for the parameter"
-            },
-            "description": {
-                "description": "Description for the parameter.",
-                "type": "string"
-            },
-            "type": {
-                "description": "The required data type for the parameter.",
-                "type": "string",
-                "enum": [ "string", "number", "boolean", "datetime", "list", "map" ]
-            },
-            "required": {
-                "description": "An optional key that declares a parameter as required (true) or not (false). Default is true.",
-                "type": "boolean",
-                "default": true
-            },
-            "constraints": {
-                "description": "The optional list of sequenced constraint clauses for the parameter.",
-                "type": "array",
-                "items": {
-                    "$ref": "#/definitions/parameter-constraints"
-                }
-            },
-            "entry_schema": {
-                "description": "The optional key that is used to declare the name of the Datatype definition for entries of certain types. entry_schema must be defined when the type is either list or map. If the type is list and the entry type is a simple type (string, number, boolean, datetime), follow with a simple string to describe the entry type. If the type is list and the entry type is a map, follow with an array to describe the keys for the entry map. If the type is list and the entry type is also list, this is not currently supported here. If the type is map, then follow with an array to describe the keys for this map. ",
-                "type": "array", "uniqueItems": true, "items": {"$ref": "#/definitions/policy_schema_parameter"}
-            }
-       },
-        "required": [
-            "name",
-            "type"
-            ],
-      "additionalProperties": false
-    },
-    "parameter-constraints": {
-      "type": "object",
-      "additionalProperties": false,
-      "properties": {
-        "equal": {
-          "description": "Constrains a property or parameter to a value equal to (‘=’) the value declared."
-        },
-        "greater_than": {
-          "description": "Constrains a property or parameter to a value greater than (‘>’) the value declared.",
-          "type": "number"
-        },
-        "greater_or_equal": {
-          "description": "Constrains a property or parameter to a value greater than or equal to (‘>=’) the value declared.",
-          "type": "number"
-        },
-        "less_than": {
-          "description": "Constrains a property or parameter to a value less than (‘<’) the value declared.",
-          "type": "number"
-        },
-        "less_or_equal": {
-          "description": "Constrains a property or parameter to a value less than or equal to (‘<=’) the value declared.",
-          "type": "number"
-        },
-        "valid_values": {
-          "description": "Constrains a property or parameter to a value that is in the list of declared values.",
-          "type": "array"
-        },
-        "length": {
-          "description": "Constrains the property or parameter to a value of a given length.",
-          "type": "number"
-        },
-        "min_length": {
-          "description": "Constrains the property or parameter to a value to a minimum length.",
-          "type": "number"
-        },
-        "max_length": {
-          "description": "Constrains the property or parameter to a value to a maximum length.",
-          "type": "number"
-        }
-      }
-    },
-    "stream_message_router": {
-      "type": "object",
-      "properties": {
-        "format": {
-          "$ref": "#/definitions/name"
-        },
-        "version": {
-          "$ref": "#/definitions/version"
-        },
-        "config_key": {
-          "type": "string"
-        },
-        "type": {
-          "description": "Type of stream to be used",
-          "type": "string",
-          "enum": [
-            "message router", "message_router"
-          ]
-        }
-      },
-      "required": [
-        "format",
-        "version",
-        "config_key",
-        "type"
-      ]
-    },
-    "stream_kafka": {
-      "type": "object",
-      "properties": {
-        "format": {
-          "$ref": "#/definitions/name"
-        },
-        "version": {
-          "$ref": "#/definitions/version"
-        },
-        "type": {
-          "description": "Type of stream to be used",
-          "type": "string",
-          "enum": [
-            "kafka"
-          ]
-        }
-      },
-      "required": [
-        "format",
-        "version",
-        "config_key",
-        "type"
-      ]
-    },
-    "publisher_http": {
-      "type": "object",
-      "properties": {
-        "format": {
-          "$ref": "#/definitions/name"
-        },
-        "version": {
-          "$ref": "#/definitions/version"
-        },
-        "config_key": {
-          "type": "string"
-        },
-        "type": {
-          "description": "Type of stream to be used",
-          "type": "string",
-          "enum": [
-            "http",
-            "https"
-          ]
-        }
-      },
-      "required": [
-        "format",
-        "version",
-        "config_key",
-        "type"
-      ]
-    },
-    "publisher_message_router": {
-      "$ref": "#/definitions/stream_message_router"
-    },
-    "publisher_kafka": {
-      "$ref": "#/definitions/stream_kafka"
-    },
-    "publisher_data_router": {
-      "type": "object",
-      "properties": {
-        "format": {
-          "$ref": "#/definitions/name"
-        },
-        "version": {
-          "$ref": "#/definitions/version"
-        },
-        "config_key": {
-          "type": "string"
-        },
-        "type": {
-          "description": "Type of stream to be used",
-          "type": "string",
-          "enum": [
-            "data router", "data_router"
-          ]
-        }
-      },
-      "required": [
-        "format",
-        "version",
-        "config_key",
-        "type"
-      ]
-    },
-    "subscriber_http": {
-      "type": "object",
-      "properties": {
-        "format": {
-          "$ref": "#/definitions/name"
-        },
-        "version": {
-          "$ref": "#/definitions/version"
-        },
-        "route": {
-          "type": "string"
-        },
-        "type": {
-          "description": "Type of stream to be used",
-          "type": "string",
-          "enum": [
-            "http",
-            "https"
-          ]
-        }
-      },
-      "required": [
-        "format",
-        "version",
-        "route",
-        "type"
-      ]
-    },
-    "subscriber_message_router": {
-      "$ref": "#/definitions/stream_message_router"
-    },
-    "subscriber_kafka": {
-      "$ref": "#/definitions/stream_kafka"
-    },
-    "subscriber_data_router": {
-      "type": "object",
-      "properties": {
-        "format": {
-          "$ref": "#/definitions/name"
-        },
-        "version": {
-          "$ref": "#/definitions/version"
-        },
-        "route": {
-          "type": "string"
-        },
-        "type": {
-          "description": "Type of stream to be used",
-          "type": "string",
-          "enum": [
-            "data router", "data_router"
-          ]
-        },
-        "config_key": {
-          "description": "Data router subscribers require config info to setup their endpoints to handle requests. For example, needs username and password",
-          "type": "string"
-        }
-      },
-      "required": [
-        "format",
-        "version",
-        "route",
-        "type",
-        "config_key"
-      ]
-    },
-    "provider" : {
-      "oneOf" : [
-        {"$ref": "#/definitions/docker-provider"},
-        {"$ref": "#/definitions/cdap-provider"}
-      ]
-    },
-    "cdap-provider" : {
-      "type": "object",
-      "properties" : {
-         "request": {
-           "$ref": "#/definitions/formatPair"
-         },
-         "response": {
-           "$ref": "#/definitions/formatPair"
-         },
-         "service_name" : {
-           "type" : "string"
-         },
-         "service_endpoint" : {
-           "type" : "string"
-         },
-         "verb" : {
-           "type": "string",
-           "enum": ["GET", "PUT", "POST", "DELETE"]
-        }
-      },
-      "required" : [
-        "request",
-        "response",
-        "service_name",
-        "service_endpoint",
-        "verb"
-        ]
-    },
-    "docker-provider": {
-      "type": "object",
-      "properties": {
-        "request": {
-          "$ref": "#/definitions/formatPair"
-        },
-        "response": {
-          "$ref": "#/definitions/formatPair"
-        },
-        "route": {
-          "type": "string"
-        },
-        "verb": {
-          "type": "string",
-          "enum": ["GET", "PUT", "POST", "DELETE"]
-        }
-      },
-      "required": [
-        "request",
-        "response",
-        "route"
-      ]
-    },
-    "caller": {
-      "type": "object",
-      "properties": {
-        "request": {
-          "$ref": "#/definitions/formatPair"
-        },
-        "response": {
-          "$ref": "#/definitions/formatPair"
-        },
-        "config_key": {
-          "type": "string"
-        }
-      },
-      "required": [
-        "request",
-        "response",
-        "config_key"
-      ]
-    },
-    "formatPair": {
-      "type": "object",
-      "properties": {
-        "format": {
-          "$ref": "#/definitions/name"
-        },
-        "version": {
-          "$ref": "#/definitions/version"
-        }
-      }
-    },
-    "name": {
-      "type": "string"
-    },
-    "version": {
-      "type": "string",
-      "pattern": "^(\\d+\\.)(\\d+\\.)(\\*|\\d+)$"
-    },
-    "artifact": {
-      "type": "object",
-      "description": "Component artifact object",
-      "properties": {
-        "uri": {
-          "type": "string",
-          "description": "Uri to artifact"
-        },
-        "type": {
-          "type": "string",
-          "enum": ["jar", "docker image"]
-        }
-      },
-      "required": ["uri", "type"]
-    },
-
-    "auxilary_cdap": {
-      "title": "cdap component specification schema",
-      "type": "object",
-      "properties": {
-        "streamname": {
-          "type": "string"
-        },
-        "artifact_name" : {
-          "type": "string"
-        },
-        "artifact_version" : {
-          "type": "string",
-          "pattern": "^(\\d+\\.)(\\d+\\.)(\\*|\\d+)$"
-        },
-        "namespace":{
-          "type": "string",
-          "description" : "optional"
-        },
-        "programs": {
-          "type": "array",
-          "uniqueItems": true,
-          "items": {
-            "$ref": "#/definitions/cdap_program"
-          }
-        }
-      },
-      "required": [
-        "streamname",
-        "programs",
-        "artifact_name",
-        "artifact_version"
-      ]
-    },
-    "cdap_program_type": {
-      "type": "string",
-      "enum": ["flows","mapreduce","schedules","spark","workflows","workers","services"]
-    },
-    "cdap_program": {
-      "type": "object",
-      "properties": {
-        "program_type": {
-          "$ref": "#/definitions/cdap_program_type"
-        },
-        "program_id": {
-          "type": "string"
-        }
-      },
-      "required": ["program_type", "program_id"]
-    },
-
-    "auxilary_docker": {
-      "title": "Docker component specification schema",
-      "type": "object",
-      "properties": {
-        "healthcheck": {
-          "description": "Define the health check that Consul should perfom for this component",
-          "type": "object",
-          "oneOf": [
-            { "$ref": "#/definitions/docker_healthcheck_http" },
-            { "$ref": "#/definitions/docker_healthcheck_script" }
-          ]
-        },
-        "ports": {
-          "description": "Port mapping to be used for Docker containers. Each entry is of the format <container port>:<host port>.",
-          "type": "array",
-          "items": {
-            "type": "string"
-          }
-        },
-        "logging": {
-          "description": "Component specific details for logging",
-          "type": "object",
-          "properties": {
-            "log_directory": {
-              "description": "The path in the container where the component writes its logs. If the component is following the EELF requirements, this would be the directory where the four EELF files are being written. (Other logs can be placed in the directory--if their names in '.log', they'll also be sent into ELK.)",
-              "type": "string"
-            },
-            "alternate_fb_path": {
-              "description": "By default, the log volume is mounted at /var/log/onap/<component_type> in the sidecar container's file system. 'alternate_fb_path' allows overriding the default.  Will affect how the log data can be found in the ELK system.",
-              "type": "string"
-            }
-          },
-          "additionalProperties": false
-        },
-        "policy": {
-           "properties": {
-             "trigger_type": {
-                "description": "Only value of docker is supported at this time.",
-                "type": "string",
-                "enum": ["docker"]
-             },
-             "script_path": {
-                "description": "Script command that will be executed for policy reconfiguration",
-                "type": "string"
-             }
-            },
-            "required": [
-              "trigger_type","script_path"
-             ],
-            "additionalProperties": false
-        },
-        "volumes": {
-          "description": "Volume mapping to be used for Docker containers. Each entry is of the format below",
-          "type": "array",
-          "items": {
-          "type": "object",
-            "properties": {
-              "host":{
-              "type":"object",
-                "path": {"type": "string"}
-              },
-              "container":{
-              "type":"object",
-                "bind": { "type": "string"},
-                "mode": { "type": "string"}
-              }
-            }
-          }
-        }
-      },
-      "required": [
-        "healthcheck"
-      ],
-      "additionalProperties": false
-    },
-    "docker_healthcheck_http": {
-      "properties": {
-        "type": {
-          "description": "Consul health check type",
-          "type": "string",
-          "enum": [
-            "http",
-            "https"
-          ]
-        },
-        "interval": {
-          "description": "Interval duration in seconds i.e. 10s",
-          "default": "15s",
-          "type": "string"
-        },
-        "timeout": {
-          "description": "Timeout in seconds i.e. 10s",
-          "default": "1s",
-          "type": "string"
-        },
-        "endpoint": {
-          "description": "Relative endpoint used by Consul to check health by making periodic HTTP GET calls",
-          "type": "string"
-        }
-      },
-      "required": [
-        "type",
-        "endpoint"
-        ]
-    },
-    "docker_healthcheck_script": {
-      "properties": {
-        "type": {
-          "description": "Consul health check type",
-          "type": "string",
-          "enum": [
-            "script",
-            "docker"
-          ]
-        },
-        "interval": {
-          "description": "Interval duration in seconds i.e. 10s",
-          "default": "15s",
-          "type": "string"
-        },
-        "timeout": {
-          "description": "Timeout in seconds i.e. 10s",
-          "default": "1s",
-          "type": "string"
-        },
-        "script": {
-          "description": "Script command that will be executed by Consul to check health",
-          "type": "string"
-        }
-      },
-      "required": [
-        "type",
-        "script"
-        ]
-    }
-  }
-}
diff --git a/mod/component-json-schemas/dcae-cli-v3-draft/dmaap-schema.json b/mod/component-json-schemas/dcae-cli-v3-draft/dmaap-schema.json
deleted file mode 100644
index 1c36972..0000000
--- a/mod/component-json-schemas/dcae-cli-v3-draft/dmaap-schema.json
+++ /dev/null
@@ -1,149 +0,0 @@
-{
-  "$id": "http://onap.org/dcaegen2/platform/dmaap",
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "title": "Schema for dmaap inputs",
-  "type": "object",
-
-  "oneOf": [
-    { "$ref": "#/definitions/message_router" },
-    { "$ref": "#/definitions/data_router" },
-    { "$ref": "#/definitions/kafka" }
-  ],
-
-  "definitions": {
-  
-    "message_router": {
-      "type": "object",
-      "properties": {
-        "type": {
-          "type": "string",
-          "enum": ["message_router"]
-        },
-        "aaf_credentials": {
-          "$ref": "#/definitions/aaf_credentials"
-        },
-        "aaf_username": {
-          "description": "Used for backward compatibility. Use aaf_credentials object in new code.",
-          "type": "string"
-        },
-        "aaf_password": {
-          "description": "Used for backward compatibility. Use aaf_credentials object in new code.",
-          "type": "string"
-        },
-        "dmaap_info": {
-          "$ref":"#/definitions/dmaap_info"
-        }
-      },
-      "required": [
-        "type",
-        "dmaap_info"
-      ],
-      "additionalProperties": false
-    },
-
-    "data_router": {
-      "type": "object",
-      "$comment": "This is currently not specified in schema. However, it is specified in RTD documentation. TODO: specify schema for DMaaP DR",     
-       "properties": {
-        "type": {
-          "type": "string",
-          "enum": ["data_router"]
-        }
-      },
-      "required": [
-        "type"
-      ],
-      "additionalProperties": true
-    },
-
-    "dmaap_info": {
-      "type": "object",
-      "properties": {
-        "client_role": {
-          "type": "string"
-        },
-        "client_id": {
-          "type": "string"
-        },
-        "location": {
-          "type": "string"
-        },
-        "topic_url": {
-          "type": "string"
-        }
-      },
-      "required": [
-        "topic_url"
-      ],
-      "additionalProperties": false
-    },
-
-    "kafka": {
-      "type": "object",
-      "properties": {
-        "type": {
-          "type": "string",
-          "enum": ["kafka"]
-        },
-        "aaf_credentials": {
-          "$ref": "#/definitions/aaf_credentials"
-        },
-        "kafka_info": {
-           "$ref": "#/definitions/kafka_info"
-        }
-      },
-      "required": [
-        "type",
-        "kafka_info"
-      ],
-      "additionalProperties": false
-    },
-
-    "kafka_info": {
-      "type": "object",
-      "description": "Defines Kafka-specific topid properties",
-      "properties": {
-        "client_role": {
-          "type": "string"
-        },
-        "client_id": {
-          "type": "string"
-        },
-        "bootstrap_servers": {
-          "description": "Comma separated list of Kafka bootstrap servers as defined in Kafka documentation",
-          "type": "string"
-        },
-        "topic_name": {
-          "description": "Name of the topic",
-          "type": "string"
-        },
-        "consumer_group_id": {
-          "description": "Can be specifed only for subscribers. More details in Kafka documentation on group.id property",
-          "type": "string"
-        },
-        "max_payload_size_bytes": {
-          "description": "Maximum payload size in bytes. Can be used for validation or creating Kafka client properties.",
-          "type": "string"
-        }
-      },
-      "required": [
-        "bootstrap_servers",
-        "topic_name"
-      ],
-      "additionalProperties": false
-    },
-
-    "aaf_credentials": {
-      "type": "object",
-      "properties": {
-        "username": {
-          "type": "string"
-        },
-        "password": {
-          "type": "string"
-        }
-      },
-      "additionalProperties": false
-    }
-  }
-}
diff --git a/mod/component-json-schemas/dcae-cli-v3-draft/samples/application-config-kafka.json b/mod/component-json-schemas/dcae-cli-v3-draft/samples/application-config-kafka.json
deleted file mode 100644
index d343c70..0000000
--- a/mod/component-json-schemas/dcae-cli-v3-draft/samples/application-config-kafka.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    "streams_publishes": {
-        "perf3gpp_regional": {
-            "type": "kafka",
-            "aaf_credentials": {
-                "username": "client",
-                "password": "very secure password"
-            },
-            "kafka_info": {
-                "bootstrap_servers": "dmaap-mr-kafka-0.regional:6060,dmaap-mr-kafka-1.regional:6060",
-                "topic_name": "REG_HVVES_PERF3GPP"
-            }
-        },
-        "perf3gpp_central": {
-            "type": "kafka",
-            "aaf_credentials": {
-                "username": "other_client",
-                "password": "another very secure password"
-            },
-            "kafka_info": {
-                "bootstrap_servers": "dmaap-mr-kafka-0.central:6060,dmaap-mr-kafka-1.central:6060",
-                "topic_name": "CEN_HVVES_PERF3GPP"
-            }
-        }
-    }
-}
diff --git a/mod/component-json-schemas/dcae-cli-v3-draft/samples/stream-kafka.json b/mod/component-json-schemas/dcae-cli-v3-draft/samples/stream-kafka.json
deleted file mode 100644
index 27ac2c9..0000000
--- a/mod/component-json-schemas/dcae-cli-v3-draft/samples/stream-kafka.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    "type": "kafka",
-    "aaf_credentials": {
-        "username": "client",
-        "password": "very secure password"
-    },
-    "kafka_info": {
-        "client_role": "com.dcae.member",
-        "client_id": "1500462518108",
-        "bootstrap_servers": "dmaap-mr-kafka-0:6060,dmaap-mr-kafka-1:6060",
-        "topic_name": "HVVES_PERF3GPP"
-    }
-}