Merge pull request redhat-cne#87 from jzding/source-type

Add source in event

Author: openshift-merge-robot

Makefile

@@ -78,7 +78,7 @@ run-consumer:
 	go run examples/consumer/main.go
 
 test:
-	go test ./...  -coverprofile=cover.out
+	go test ./... --tags=unittests -coverprofile=cover.out
 
 functests:
 	SUITE=./test/cne hack/run-functests.sh

go.mod

@@ -9,8 +9,8 @@ require (
 	github.com/onsi/ginkgo v1.16.5
 	github.com/onsi/gomega v1.17.0
 	github.com/prometheus/client_golang v1.11.0
-	github.com/redhat-cne/rest-api v0.1.1-0.20211206194632-bc3eb46ad9d0
-	github.com/redhat-cne/sdk-go v0.1.1-0.20211206194140-5b52c616af2b
+	github.com/redhat-cne/rest-api v0.1.1-0.20220105171308-cc511366a079
+	github.com/redhat-cne/sdk-go v0.1.1-0.20220105170230-b17827c91503
 	github.com/sirupsen/logrus v1.8.1
 	github.com/stretchr/testify v1.7.0
 	github.com/valyala/fasthttp v1.29.0

go.sum

@@ -381,10 +381,10 @@ github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4O
 github.com/prometheus/procfs v0.6.0 h1:mxy4L2jP6qMonqmq+aTtOx1ifVWUgG/TAmntgbh3xv4=
 github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
 github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
-github.com/redhat-cne/rest-api v0.1.1-0.20211206194632-bc3eb46ad9d0 h1:dtm5GyMpu17/En+GmS7ojvRsEuG2e719MXH8CI8JXSY=
-github.com/redhat-cne/rest-api v0.1.1-0.20211206194632-bc3eb46ad9d0/go.mod h1:sGK4icx3lVW0vDFRIx2m/lRMwW/axcmADh7o0Y3ZiVE=
-github.com/redhat-cne/sdk-go v0.1.1-0.20211206194140-5b52c616af2b h1:Z7Y2QrpCyLiAWTGz0yyJtxOu3T7f9GCXAD/sYHdpcVk=
-github.com/redhat-cne/sdk-go v0.1.1-0.20211206194140-5b52c616af2b/go.mod h1:1FXE/O2PhDnazeCidsAIJJ5lLaaWHBXNP5HxaJ1hf0U=
+github.com/redhat-cne/rest-api v0.1.1-0.20220105171308-cc511366a079 h1:Qb9+5k3gES0qQfxLWfsEuzFpCkFMcV3LcTTE2p/ZtG0=
+github.com/redhat-cne/rest-api v0.1.1-0.20220105171308-cc511366a079/go.mod h1:vb1QG25ojKDcT4KMboBP2QRWZG7SNH9senqSsS4Khhk=
+github.com/redhat-cne/sdk-go v0.1.1-0.20220105170230-b17827c91503 h1:gfwZqJ0xiWF6eDrtQuYhzRblG7LBHYUbskUl0A+IANs=
+github.com/redhat-cne/sdk-go v0.1.1-0.20220105170230-b17827c91503/go.mod h1:1FXE/O2PhDnazeCidsAIJJ5lLaaWHBXNP5HxaJ1hf0U=
 github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
 github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=

pkg/common/common.go

@@ -132,7 +132,7 @@ func CreateSubscription(config *SCConfiguration, subscription pubsub.PubSub) (su
 }
 
 // CreateEvent create an event
-func CreateEvent(pubSubID, eventType string, data ceevent.Data) (ceevent.Event, error) {
+func CreateEvent(pubSubID, eventType, source string, data ceevent.Data) (ceevent.Event, error) {
 	// create an event
 	if pubSubID == "" {
 		return ceevent.Event{}, fmt.Errorf("id is a required field")
@@ -143,6 +143,7 @@ func CreateEvent(pubSubID, eventType string, data ceevent.Data) (ceevent.Event,
 	event := v1event.CloudNativeEvent()
 	event.ID = pubSubID
 	event.Type = eventType
+	event.SetSource(source)
 	event.SetTime(types.Timestamp{Time: time.Now().UTC()}.Time)
 	event.SetDataContentType(ceevent.ApplicationJSON)
 	event.SetData(data)

plugins/mock/mock_plugin.go

@@ -113,19 +113,19 @@ func createMockEvent(pub pubsub.PubSub) (ceEvent.Event, error) {
 	data := ceEvent.Data{
 		Version: "v1",
 		Values: []ceEvent.DataValue{{
-			Resource:  pub.Resource,
+			Resource:  string(ptp.SyncStatusState),
 			DataType:  ceEvent.NOTIFICATION,
 			ValueType: ceEvent.ENUMERATION,
 			Value:     ptp.ACQUIRING_SYNC,
 		},
 			{
-				Resource:  pub.Resource,
+				Resource:  string(ptp.SyncStatusState),
 				DataType:  ceEvent.METRIC,
 				ValueType: ceEvent.DECIMAL,
 				Value:     "99.6",
 			},
 		},
 	}
-	e, err := common.CreateEvent(pub.ID, string(ptp.PtpStateChange), data)
+	e, err := common.CreateEvent(pub.ID, pub.Resource, string(ptp.PtpStateChange), data)
 	return e, err
 }

plugins/ptp_operator/metrics/metrics.go

@@ -544,22 +544,23 @@ func (p *PTPEventManager) PublishEvent(state ptp.SyncState, ptpOffset int64, ifa
 	if state == "" {
 		return
 	}
+	source := fmt.Sprintf("/cluster/%s/ptp/interface/%s", p.nodeName, iface)
 	data := ceevent.Data{
 		Version: "v1",
 		Values: []ceevent.DataValue{{
-			Resource:  fmt.Sprintf("/cluster/%s/ptp/interface/%s", p.nodeName, iface),
+			Resource:  string(ptp.SyncStatusState),
 			DataType:  ceevent.NOTIFICATION,
 			ValueType: ceevent.ENUMERATION,
 			Value:     state,
 		}, {
-			Resource:  fmt.Sprintf("/cluster/%s/ptp/interface/%s", p.nodeName, iface),
+			Resource:  string(ptp.SyncStatusState),
 			DataType:  ceevent.METRIC,
 			ValueType: ceevent.DECIMAL,
 			Value:     float64(ptpOffset),
 		},
 		},
 	}
-	e, err := common.CreateEvent(p.publisherID, string(eventType), data)
+	e, err := common.CreateEvent(p.publisherID, string(eventType), source, data)
 	if err != nil {
 		log.Errorf("failed to create ptp event, %s", err)
 		return

vendor/github.com/redhat-cne/sdk-go/pkg/event/event.go

@@ -167,11 +167,11 @@ github.com/prometheus/common/model
 github.com/prometheus/procfs
 github.com/prometheus/procfs/internal/fs
 github.com/prometheus/procfs/internal/util
-# github.com/redhat-cne/rest-api v0.1.1-0.20211206194632-bc3eb46ad9d0
+# github.com/redhat-cne/rest-api v0.1.1-0.20220105171308-cc511366a079
 ## explicit; go 1.17
 github.com/redhat-cne/rest-api
 github.com/redhat-cne/rest-api/pkg/localmetrics
-# github.com/redhat-cne/sdk-go v0.1.1-0.20211206194140-5b52c616af2b
+# github.com/redhat-cne/sdk-go v0.1.1-0.20220105170230-b17827c91503
 ## explicit; go 1.17
 github.com/redhat-cne/sdk-go/pkg/channel
 github.com/redhat-cne/sdk-go/pkg/errorhandler