diff options
| -rw-r--r-- | docs/index.rst | 9 | ||||
| -rw-r--r-- | docs/media/CDS_architecture.jpg | bin | 140539 -> 0 bytes | |||
| -rw-r--r-- | docs/media/CDS_architecture_latest.png | bin | 0 -> 204735 bytes | |||
| -rw-r--r-- | ms/blueprintsprocessor/modules/commons/message-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/message/service/KafkaMessageProducerService.kt | 15 |
4 files changed, 17 insertions, 7 deletions
diff --git a/docs/index.rst b/docs/index.rst index b3977c1f5..9427fa9a2 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -43,7 +43,7 @@ Design Studio is to create and populate a controller blueprint, create a configuration file from this Controller blueprint, and download this configuration file (configlet) to a VNF/PNF. -|image1| +|cdsArchitectureImage| Modeling Concept @@ -115,10 +115,9 @@ https://github.com/onap/ccsdk-apps/blob/master/components/scripts/python/ccsdk_n :width: 7.88889in :height: 4.43750in -.. |image1| image:: media/CDS_architecture.jpg - :height: 4.43750in - :width: 7.88889in - +.. |cdsArchitectureImage| image:: media/CDS_architecture_latest.png + :scale: 30 % + User Guide ---------- diff --git a/docs/media/CDS_architecture.jpg b/docs/media/CDS_architecture.jpg Binary files differdeleted file mode 100644 index c8528ac1e..000000000 --- a/docs/media/CDS_architecture.jpg +++ /dev/null diff --git a/docs/media/CDS_architecture_latest.png b/docs/media/CDS_architecture_latest.png Binary files differnew file mode 100644 index 000000000..45ecc0f2e --- /dev/null +++ b/docs/media/CDS_architecture_latest.png diff --git a/ms/blueprintsprocessor/modules/commons/message-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/message/service/KafkaMessageProducerService.kt b/ms/blueprintsprocessor/modules/commons/message-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/message/service/KafkaMessageProducerService.kt index 8de1f05be..8958d4f0c 100644 --- a/ms/blueprintsprocessor/modules/commons/message-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/message/service/KafkaMessageProducerService.kt +++ b/ms/blueprintsprocessor/modules/commons/message-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/message/service/KafkaMessageProducerService.kt @@ -23,6 +23,7 @@ import org.apache.kafka.clients.producer.Callback import org.apache.kafka.clients.producer.KafkaProducer import org.apache.kafka.clients.producer.ProducerRecord import org.apache.kafka.common.header.internals.RecordHeader +import org.onap.ccsdk.cds.blueprintsprocessor.core.api.data.ExecutionServiceInput import org.onap.ccsdk.cds.blueprintsprocessor.core.api.data.ExecutionServiceOutput import org.onap.ccsdk.cds.blueprintsprocessor.core.api.data.Status import org.onap.ccsdk.cds.blueprintsprocessor.message.MessageProducerProperties @@ -79,8 +80,18 @@ class KafkaMessageProducerService( headers.forEach { (key, value) -> recordHeaders.add(RecordHeader(key, value.toByteArray())) } } val callback = Callback { metadata, exception -> - if (exception == null) log.trace("message published to(${metadata.topic()}), offset(${metadata.offset()}), headers :$headers") - else log.error("ERROR : ${exception.message}") + if (exception != null) + log.error("ERROR : ${exception.message}") + else { + var logMessage = when (clonedMessage) { + is ExecutionServiceInput -> + "Request published to ${metadata.topic()} for CBA: ${clonedMessage.actionIdentifiers.blueprintName} version: ${clonedMessage.actionIdentifiers.blueprintVersion}" + is ExecutionServiceOutput -> + "Response published to ${metadata.topic()} for CBA: ${clonedMessage.actionIdentifiers.blueprintName} version: ${clonedMessage.actionIdentifiers.blueprintVersion}" + else -> "Message published to(${metadata.topic()}), offset(${metadata.offset()}), headers :$headers" + } + log.info(logMessage) + } } messageTemplate().send(record, callback) return true |
