Updates to TCA spec and output format

[dcaegen2/analytics/tca.git] / dpo / tcaSpec.json

diff --git a/dpo/tcaSpec.json b/dpo/tcaSpec.json
index c906395..0bbb4a5 100644 (file)
--- a/dpo/tcaSpec.json
+++ b/dpo/tcaSpec.json
@@ -49,7 +49,7 @@
   },\r
   "artifacts": [\r
     {\r
-      "uri": "${nexusproxy}/repository/dcae-dev-raw/jar_files/dcae-analytics-tca-2.0.0.jar",\r
+      "uri": "https://nexus.onap.org/service/local/repositories/snapshots/content/org/onap/dcaegen2/analytics/tca/dcae-analytics-cdap-tca/2.0.0-SNAPSHOT/dcae-analytics-cdap-tca-2.0.0-20171006.155007-46.jar",\r
       "type": "jar"\r
     }\r
   ],\r
@@ -107,6 +107,36 @@
       }\r
     ],\r
     "app_preferences": [\r
+      {\r
+        "name" :  "subscriberHostName",\r
+        "description" :  "",\r
+        "value" : "HOSTNAME"\r
+      },\r
+      {\r
+        "name" :  "subscriberHostPort",\r
+        "description" :  "",\r
+        "value" : 1234\r
+      },\r
+      {\r
+        "name" :  "subscriberTopicName",\r
+        "description" :  "",\r
+        "value" : "com.att.dcae.dmaap.mtnje2.DcaeTestVESSub"\r
+      },\r
+      {\r
+        "name" :  "subscriberProtocol",\r
+        "description" :  "",\r
+        "value" : "https"\r
+      },\r
+      {\r
+        "name" :  "subscriberUserName",\r
+        "description" :  "",\r
+        "value" : "USERNAME"\r
+      },\r
+      {\r
+        "name" :  "subscriberUserPassword",\r
+        "description" :  "",\r
+        "value" : "PASSWORD"\r
+      },\r
       {\r
         "name": "subscriberContentType",\r
         "description": "Subscriber Content Type",\r
@@ -137,6 +167,36 @@
         "description": "Subscriber Polling Interval in milliseconds",\r
         "value": 30000\r
       },\r
+      {\r
+        "name" :  "publisherHostName",\r
+        "description" :  "",\r
+        "value" : "HOSTNAME"\r
+      },\r
+      {\r
+        "name" :  "publisherHostPort",\r
+        "description" :  "",\r
+        "value" : 1234\r
+      },\r
+      {\r
+        "name" :  "publisherTopicName",\r
+        "description" :  "",\r
+        "value" : "com.att.dcae.dmaap.mtnje2.DcaeTestVESPub"\r
+      },\r
+      {\r
+        "name" :  "publisherProtocol",\r
+        "description" :  "",\r
+        "value" : "https"\r
+      },\r
+      {\r
+        "name" :  "publisherUserName",\r
+        "description" :  "",\r
+        "value" : "USERNAME"\r
+      },\r
+      {\r
+        "name" :  "publisherUserPassword",\r
+        "description" :  "",\r
+        "value" : "PASSWORD"\r
+      },\r
       {\r
         "name": "publisherContentType",\r
         "description": "Publisher Content Type",\r
@@ -185,12 +245,12 @@
       {
         "name": "aaiEnrichmentUserName",
         "description": "A&AI Enrichment API username",
-        "value": "DCAE"
+        "value": "USERNAME"
       },
       {
         "name": "aaiEnrichmentUserPassword",
         "description": "A&AI Enrichment API password",
-        "value": "DCAE"
+        "value": "PASSWORD"
       },
       {
         "name": "aaiEnrichmentIgnoreSSLCertificateErrors",
@@ -210,7 +270,7 @@
       {
         "name": "aaiEnrichmentProxyURL",
         "description": "A&AI Enrichment API Proxy URL",
-        "value": "http://username:password@proxyhost.com:8080"
+        "value": "URL"
       },      \r
       {\r
         "name": "tca_policy",\r
@@ -291,7 +351,8 @@
                       "LESS",
                       "LESS_OR_EQUAL",
                       "GREATER",
-                      "GREATER_OR_EQUAL"
+                      "GREATER_OR_EQUAL",\r
+                      "EQUAL"
                 ]
               }]
             }, {