fix component description - spec

Change-Id: Ia21be80dfc7c31bd1fa15082a6524c14877c991d
Issue-ID: DCAEGEN2-1491
Signed-off-by: micdzied <michal.1.dziedzic@nokia.com>

diff --git a/dpo/data-formats/aai-interaction.json b/dpo/data-formats/aai-interaction.json
new file mode 100644 (file)
index 0000000..6f6b76b
--- /dev/null
+++ b/dpo/data-formats/aai-interaction.json
@@ -0,0 +1,11 @@
+{
+  "self": {
+    "name": "AAI_Interaction",
+    "version": "1.0.0",
+    "description": "Messages exchanged between a microservice and AAI"
+  },
+  "dataformatversion": "1.0.0",
+  "unstructured": {
+    "encoding": "UTF-8"
+  }
+}
\ No newline at end of file

diff --git a/dpo/data-formats/pnf-reregistration.json b/dpo/data-formats/pnf-reregistration.json
new file mode 100644 (file)
index 0000000..ae3a46d
--- /dev/null
+++ b/dpo/data-formats/pnf-reregistration.json
@@ -0,0 +1,11 @@
+{
+  "self": {
+    "name": "PNF_Reregistration_internal",
+    "version": "1.0.0",
+    "description": "Internal event sent by PRH for PNF re-registration"
+  },
+  "dataformatversion": "1.0.0",
+  "unstructured": {
+    "encoding": "UTF-8"
+  }
+}
\ No newline at end of file

diff --git a/dpo/data-formats/prh.dataformatspec.json b/dpo/data-formats/prh.dataformatspec.json
index 4ed44f8..c7eb233 100644 (file)
--- a/dpo/data-formats/prh.dataformatspec.json
+++ b/dpo/data-formats/prh.dataformatspec.json
@@ -1,15 +1,14 @@
 {
     "self": {
         "name": "prh",
-        "version": "1.2.",
+        "version": "1.2.2",
         "description": "Physical Resource Handler (PRH)"
-
     },
     "dataformatversion": "1.0.0",
     "reference": {
-        "name": "VES (NF Event Streaming) Specification",
-        "version": "30.0.1",
-        "format": "json",
-        "url": "https://gerrit.onap.org/r/gitweb?p=dcaegen2/collectors/ves.git;a=blob;f=etc/CommonEventFormat_30.0.1.json;hb=HEAD"
+        "name": "VES_specification",
+        "version": "7.1.0",
+        "format": "JSON",
+        "url": "https://git.onap.org/dcaegen2/collectors/ves/plain/dpo/data-formats/VES-7.30.1-dataformat.json"
     }
 }
\ No newline at end of file

diff --git a/dpo/spec/prh.componentspec.json b/dpo/spec/prh.componentspec.json
index 0a020ae..5231f29 100644 (file)
--- a/dpo/spec/prh.componentspec.json
+++ b/dpo/spec/prh.componentspec.json
@@ -1,18 +1,43 @@
 {
   "self": {
-    "version": "1.1.0",
-    "name": "dcae-hv-ves-collector",
-    "description": "Collector for receiving stream of High Volume VES events through socket interface",
+    "version": "1.2.2",
+    "name": "dcaegen2-services-prh",
+    "description": "PNF Registration Handler",
     "component_type": "docker"
   },
   "streams": {
-    "subscribes": [],
+    "subscribes": [
+      {
+        "format": "prh",
+        "version": "1.0.0",
+        "config_key": "unauthenticated.VES_PNFREG_OUTPUT",
+        "type": "message_router"
+      }
+    ],
     "publishes": [
       {
-        "format": "hv-ves-event",
-        "version": "7.1.0",
-        "type": "kafka",
-        "config_key": "perf3gpp"
+        "format": "prh",
+        "version": "1.0.0",
+        "config_key": "unauthenticated.PNF_READY",
+        "type": "message_router"
+      },
+      {
+        "format": "PNF_Reregistration_internal",
+        "version": "1.0.0",
+        "config_key": "unauthenticated.PNF_UPDATE",
+        "type": "message_router"
+      },
+      {
+        "format": "AAI_Interaction",
+        "version": "1.0.0",
+        "config_key": "/aai/v12/network/pnfs/pnf/pnf_name",
+        "type": "message_router"
+      },
+      {
+        "format": "AAI_Interaction",
+        "version": "1.0.0",
+        "config_key": "/aai/v12/network/pnfs/pnf/pnf_name",
+        "type": "message_router"
       }
     ]
   },
@@ -20,41 +45,94 @@
     "calls": [],
     "provides": []
   },
-  "parameters": [],
+  "parameters": [
+    {
+      "name": "server.port",
+      "value": "8433",
+      "description": "PRH server port",
+      "sourced_at_deployment": false,
+      "policy_editable": false,
+      "designer_editable": false
+    },
+    {
+      "name": "server.ssl.key-store-type",
+      "value": "PKCS12",
+      "description": "Key store type required for ssl",
+      "sourced_at_deployment": false,
+      "policy_editable": false,
+      "designer_editable": false
+    },
+    {
+      "name": "server.ssl.key-store-password",
+      "value": "nokiapnf",
+      "description": "Key store password required for ssl",
+      "sourced_at_deployment": false,
+      "policy_editable": false,
+      "designer_editable": false
+    },
+    {
+      "name": "server.ssl.key-store",
+      "value": "classpath:keystore-local",
+      "description": "Key store local required for ssl",
+      "sourced_at_deployment": false,
+      "policy_editable": false,
+      "designer_editable": false
+    },
+    {
+      "name": "server.ssl.key-password",
+      "value": "nokiapnf",
+      "description": "Key password required for ssl",
+      "sourced_at_deployment": false,
+      "policy_editable": false,
+      "designer_editable": false
+    },
+    {
+      "name": "server.ssl.keyAlias",
+      "value": "tomcat-localhost",
+      "description": "Key alias required for ssl",
+      "sourced_at_deployment": false,
+      "policy_editable": false,
+      "designer_editable": false
+    },
+    {
+      "name": "consulHost",
+      "value": "10.42.111.9",
+      "description": "The host pointing to consul",
+      "sourced_at_deployment": false,
+      "policy_editable": false,
+      "designer_editable": false
+    },
+    {
+      "name": "cbsName",
+      "value": "cbs",
+      "description": "The name of cbs",
+      "sourced_at_deployment": false,
+      "policy_editable": false,
+      "designer_editable": false
+    },
+    {
+      "name": "appName",
+      "value": "dcae-prh",
+      "description": "The name of application",
+      "sourced_at_deployment": false,
+      "policy_editable": false,
+      "designer_editable": false
+    }
+  ],
   "auxilary": {
     "healthcheck": {
-      "type": "script",
-      "interval": "15s",
-      "timeout": "2s",
-      "script": "/opt/ves-hv-collector/healthcheck.sh"
+      "type": "http",
+      "endpoint": "/heartbeat"
     },
-    "volumes": [
-      {
-        "container": {
-          "bind": "/etc/ves-hv/ssl"
-        },
-        "host": {
-          "path": "/opt/app/dcae-certificate"
-        }
-      },
-      {
-        "container": {
-          "bind": "/var/log/ONAP/dcae-hv-ves-collector"
-        },
-        "host": {
-          "path": "/var/log/ONAP/dcae-hv-ves-collector"
-        }
-      }
-    ],
     "ports": [
-      "6060:6060",
-      "6061:6061"
+      "8100:8100",
+      "8433:8433"
     ]
   },
   "artifacts": [
     {
       "type": "docker image",
-      "uri": "nexus.onap.org:10001/onap/org.onap.dcaegen2.collectors.hv-ves.hv-collector-main:1.1.0-SNAPSHOT"
+      "uri": "nexus3.onap.org:10003/onap/org.onap.dcaegen2.services.prh.prh-app-server:1.2.2"
     }
   ]
 }