Merge "Add docker-compose files 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 f846f9f..db46c54 100644 (file)
--- a/dmaap-mediator-producer/internal/config/registrator.go
+++ b/dmaap-mediator-producer/internal/config/registrator.go
@@ -21,19 +21,23 @@
 package config
 
 import (
+       "encoding/json"
        "fmt"
        "net/url"
 
        log "github.com/sirupsen/logrus"
 
-       "oransc.org/nonrtric/dmaapmediatorproducer/internal/jobtypes"
+       "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 Registrator interface {
-       RegisterTypes(types []*jobtypes.Type) error
+       RegisterTypes(types []*jobs.TypeData) error
+       RegisterProducer(producerId string, producerInfo *ProducerRegistrationInfo)
 }
 
 type RegistratorImpl struct {
@@ -46,13 +50,25 @@ func NewRegistratorImpl(infoCoordAddr string) *RegistratorImpl {
        }
 }
 
-func (r RegistratorImpl) RegisterTypes(jobTypes []*jobtypes.Type) error {
+func (r RegistratorImpl) RegisterTypes(jobTypes []jobs.TypeData) error {
        for _, jobType := range jobTypes {
-               body := fmt.Sprintf(`{"info_job_data_schema": %v}`, jobType.Schema)
-               if error := restclient.Put(r.infoCoordinatorAddress+registerTypePath+url.PathEscape(jobType.Name), []byte(body)); error != nil {
+               body := fmt.Sprintf(`{"info_job_data_schema": %v}`, typeSchema)
+               if error := restclient.Put(r.infoCoordinatorAddress+registerTypePath+url.PathEscape(jobType.TypeId), []byte(body)); error != nil {
                        return error
                }
                log.Debugf("Registered type: %v", jobType)
        }
        return nil
 }
+
+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 {
+                       return putErr
+               }
+               log.Debugf("Registered producer: %v", producerId)
+               return nil
+       } else {
+               return marshalErr
+       }
+}