Merge in changes there were made since seeding

* Fix DR config keys issue
* Add data format generate command
* Improve error messaging
* Add in support for inputs otherwise known as "sourced at deployment"

Change-Id: I9d97c30aeba587315d7fd1a18c38f71d8199d42b
Issue-Id: DCAEGEN2-91
Signed-off-by: Michael Hwang <mhwang@research.att.com>

5 files changed, 89 insertions, 0 deletions

diff --git a/component-json-schemas/component-spec-schema.json b/component-json-schemas/component-spec-schema.json
index 690cc96..27d0403 100644
--- a/component-json-schemas/component-spec-schema.json
+++ b/component-json-schemas/component-spec-schema.json
@@ -219,6 +219,11 @@
           "type": "boolean",
           "default": false
         },
+        "sourced_at_deployment": {
+          "description": "An optional key that declares a parameter's value to be assigned at deployment time (true). Default is false.",
+          "type": "boolean",
+          "default": false
+        },
         "policy_schema" :{
           "type": "array",
           "uniqueItems": true,
diff --git a/component-json-schemas/dmaap-schema.json b/component-json-schemas/dmaap-schema.json
new file mode 100644
index 0000000..e6745f7
--- /dev/null
+++ b/component-json-schemas/dmaap-schema.json
@@ -0,0 +1,51 @@
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "title": "Schema for dmaap inputs",
+  "type": "object",
+  "oneOf": [
+    { "$ref": "#/definitions/message_router" }
+  ],
+  "definitions": {
+    "message_router": {
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "enum": ["message_router"]
+        },
+        "aaf_username": {
+          "type": "string"
+        },
+        "aaf_password": {
+          "type": "string"
+        },
+        "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
+        }
+      },
+      "required": [
+        "type",
+        "dmaap_info"
+      ],
+      "additionalProperties": false
+    }
+  }
+}
diff --git a/component-json-schemas/tests/dmaap-mr-bad-extra.json b/component-json-schemas/tests/dmaap-mr-bad-extra.json
new file mode 100644
index 0000000..e1821d5
--- /dev/null
+++ b/component-json-schemas/tests/dmaap-mr-bad-extra.json
@@ -0,0 +1,12 @@
+{
+        "type": "message_router",
+        "aaf_username": "foo3",
+        "aaf_password": "bar3",
+        "something_else": "boo",
+        "dmaap_info":{
+           "client_role":"some.dcae.member",
+           "client_id":"123456",
+           "location":"mtc5",
+           "topic_url":"https://message-router-url/some-topic"
+        }
+}
diff --git a/component-json-schemas/tests/dmaap-mr-bad-missing.json b/component-json-schemas/tests/dmaap-mr-bad-missing.json
new file mode 100644
index 0000000..9151032
--- /dev/null
+++ b/component-json-schemas/tests/dmaap-mr-bad-missing.json
@@ -0,0 +1,10 @@
+{
+        "type": "message_router",
+        "aaf_username": "foo3",
+        "aaf_password": "bar3",
+        "dmaap_info":{
+           "client_role":"some.dcae.member",
+           "client_id":"123456",
+           "location":"mtc5"
+        }
+}
diff --git a/component-json-schemas/tests/dmaap-mr-good.json b/component-json-schemas/tests/dmaap-mr-good.json
new file mode 100644
index 0000000..d3e8dda
--- /dev/null
+++ b/component-json-schemas/tests/dmaap-mr-good.json
@@ -0,0 +1,11 @@
+{
+        "type": "message_router",
+        "aaf_username": "foo3",
+        "aaf_password": "bar3",
+        "dmaap_info":{
+           "client_role":"some.dcae.member",
+           "client_id":"123456",
+           "location":"mtc5",
+           "topic_url":"https://message-router-url/some-topic"
+        }
+}