Fix registration of types for DMaaP Mediator

[nonrtric.git] / dmaap-mediator-producer / internal / config / registrator.go

diff --git a/dmaap-mediator-producer/internal/config/registrator.go b/dmaap-mediator-producer/internal/config/registrator.go
index db46c54..1dd0ad1 100644 (file)
--- a/dmaap-mediator-producer/internal/config/registrator.go
+++ b/dmaap-mediator-producer/internal/config/registrator.go
@@ -27,33 +27,55 @@ import (
 
        log "github.com/sirupsen/logrus"
 
-       "oransc.org/nonrtric/dmaapmediatorproducer/internal/jobs"
        "oransc.org/nonrtric/dmaapmediatorproducer/internal/restclient"
 )
 
 const registerTypePath = "/data-producer/v1/info-types/"
 const registerProducerPath = "/data-producer/v1/info-producers/"
-const typeSchema = `{"type": "object","properties": {},"additionalProperties": false}`
+
+type TypeDefinition struct {
+       Identity        string `json:"id"`
+       DMaaPTopicURL   string `json:"dmaapTopicUrl"`
+       KafkaInputTopic string `json:"kafkaInputTopic"`
+       TypeSchema      interface{}
+}
+
+func (td TypeDefinition) IsKafkaType() bool {
+       return td.KafkaInputTopic != ""
+}
+
+func (td TypeDefinition) IsDMaaPType() bool {
+       return td.DMaaPTopicURL != ""
+}
+
+type ProducerRegistrationInfo struct {
+       InfoProducerSupervisionCallbackUrl string   `json:"info_producer_supervision_callback_url"`
+       SupportedInfoTypes                 []string `json:"supported_info_types"`
+       InfoJobCallbackUrl                 string   `json:"info_job_callback_url"`
+}
 
 type Registrator interface {
-       RegisterTypes(types []*jobs.TypeData) error
+       RegisterTypes(types []TypeDefinition) error
        RegisterProducer(producerId string, producerInfo *ProducerRegistrationInfo)
 }
 
 type RegistratorImpl struct {
        infoCoordinatorAddress string
+       httpClient             restclient.HTTPClient
 }
 
-func NewRegistratorImpl(infoCoordAddr string) *RegistratorImpl {
+func NewRegistratorImpl(infoCoordAddr string, client restclient.HTTPClient) *RegistratorImpl {
        return &RegistratorImpl{
                infoCoordinatorAddress: infoCoordAddr,
+               httpClient:             client,
        }
 }
 
-func (r RegistratorImpl) RegisterTypes(jobTypes []jobs.TypeData) error {
+func (r RegistratorImpl) RegisterTypes(jobTypes []TypeDefinition) error {
        for _, jobType := range jobTypes {
-               body := fmt.Sprintf(`{"info_job_data_schema": %v}`, typeSchema)
-               if error := restclient.Put(r.infoCoordinatorAddress+registerTypePath+url.PathEscape(jobType.TypeId), []byte(body)); error != nil {
+               s, _ := json.Marshal(jobType.TypeSchema)
+               body := fmt.Sprintf(`{"info_job_data_schema": %v}`, string(s))
+               if error := restclient.Put(r.infoCoordinatorAddress+registerTypePath+url.PathEscape(jobType.Identity), []byte(body), r.httpClient); error != nil {
                        return error
                }
                log.Debugf("Registered type: %v", jobType)
@@ -63,7 +85,7 @@ func (r RegistratorImpl) RegisterTypes(jobTypes []jobs.TypeData) error {
 
 func (r RegistratorImpl) RegisterProducer(producerId string, producerInfo *ProducerRegistrationInfo) error {
        if body, marshalErr := json.Marshal(producerInfo); marshalErr == nil {
-               if putErr := restclient.Put(r.infoCoordinatorAddress+registerProducerPath+url.PathEscape(producerId), []byte(body)); putErr != nil {
+               if putErr := restclient.Put(r.infoCoordinatorAddress+registerProducerPath+url.PathEscape(producerId), []byte(body), r.httpClient); putErr != nil {
                        return putErr
                }
                log.Debugf("Registered producer: %v", producerId)