implement Websock functionality in sendCcNotification in meep-rnis (e2d915fb) · Commits · MEC - Multi-access Edge Computing / ETSI MEC Sandbox

go-apps/meep-rnis/go.mod

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -13,13 +13,12 @@ require (
	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-model v0.0.0		github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-model v0.0.0
	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-mq v0.0.0		github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-mq v0.0.0
	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-redis v0.0.0		github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-redis v0.0.0
	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-rnis-client v0.0.0 // indirect
	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-sandbox-ctrl-client v0.0.0		github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-sandbox-ctrl-client v0.0.0
	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-service-mgmt-client v0.0.0		github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-service-mgmt-client v0.0.0
	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-swagger-api-mgr v0.0.0		github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-swagger-api-mgr v0.0.0
	github.com/antihax/optional v1.0.0 // indirect
	github.com/gorilla/handlers v1.4.0		github.com/gorilla/handlers v1.4.0
	github.com/gorilla/mux v1.8.0		github.com/gorilla/mux v1.8.0
			github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c
	github.com/prometheus/client_golang v1.9.0		github.com/prometheus/client_golang v1.9.0
	)		)

go-apps/meep-rnis/go.sum

+20 −0

go-apps/meep-rnis/server/rnis.go

+51 −8

Original line number	Original line	Diff line number	Diff line
	@@ -42,6 +42,7 @@ import (
	smc "github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-service-mgmt-client"		smc "github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-service-mgmt-client"

	"github.com/gorilla/mux"		"github.com/gorilla/mux"
			"github.com/gorilla/websocket"
	)		)

	const moduleName = "meep-rnis"		const moduleName = "meep-rnis"
	@@ -1610,12 +1611,17 @@ func checkCcNotificationRegisteredSubscriptions(appId string, assocId *Associate
	notif.AssociateId = append(notif.AssociateId, notifAssociateId)		notif.AssociateId = append(notif.AssociateId, notifAssociateId)
	notif.Links.Subscription.Href = hostUrl.String() + basePath + "subscriptions/" + subsIdStr		notif.Links.Subscription.Href = hostUrl.String() + basePath + "subscriptions/" + subsIdStr

	sendCcNotification(subscription.CallbackReference, notif)		if subscription.CallbackReference != "" {
			sendCcNotification(subscription.CallbackReference, notif, false)
			log.Info("Cell_change Notification" + "(" + subsIdStr + ")")
			} else {
			sendCcNotification(subscription.WebsockNotifConfig.WebsocketUri, notif, true)
	log.Info("Cell_change Notification" + "(" + subsIdStr + ")")		log.Info("Cell_change Notification" + "(" + subsIdStr + ")")
	}		}
	}		}
	}		}
	}		}
			}

	func checkReNotificationRegisteredSubscriptions(appId string, assocId AssociateId, newPlmn Plmn, oldPlmn *Plmn, qci int32, newCellId string, oldCellId string, erabId int32) {		func checkReNotificationRegisteredSubscriptions(appId string, assocId AssociateId, newPlmn Plmn, oldPlmn *Plmn, qci int32, newCellId string, oldCellId string, erabId int32) {

	@@ -2047,22 +2053,57 @@ func checkNrMrNotificationRegisteredSubscriptions(key string, jsonInfo string, e
	return nil		return nil
	}		}

	func sendCcNotification(notifyUrl string, notification CellChangeNotification) {		func sendCcNotification(notifyUrl string, notification CellChangeNotification, isWebsocket bool) {
	startTime := time.Now()		startTime := time.Now()
	jsonNotif, err := json.Marshal(notification)		jsonNotif, err := json.Marshal(notification)
	if err != nil {		if err != nil {
	log.Error(err.Error())		log.Error(err.Error())
	}		}

	resp, err := http.Post(notifyUrl, "application/json", bytes.NewBuffer(jsonNotif))		var resp *http.Response
	duration := float64(time.Since(startTime).Microseconds()) / 1000.0		var c *websocket.Conn

			switch isWebsocket {
			case true:
			u := url.URL{
			Host: notifyUrl,
			//Path: "/"
			}
			c, _, err = websocket.DefaultDialer.Dial(u.String(), nil)
			if err != nil {
			log.Error(err.Error())
			break
			}

			// send message
			err = c.WriteMessage(websocket.TextMessage, []byte(jsonNotif))
			if err != nil {
			// handle error
			log.Error(err.Error())
			break
			}

			// receive message
			_, _, err = c.ReadMessage()
			if err != nil {
			log.Error(err.Error())
			break
			}

			resp.StatusCode = http.StatusNoContent
			case false:
			resp, err = http.Post(notifyUrl, "application/json", bytes.NewBuffer(jsonNotif))
	_ = httpLog.LogTx(notifyUrl, "POST", string(jsonNotif), resp, startTime)		_ = httpLog.LogTx(notifyUrl, "POST", string(jsonNotif), resp, startTime)
			}

			duration := float64(time.Since(startTime).Microseconds()) / 1000.0
	if err != nil {		if err != nil {
	log.Error(err)		log.Error(err)
	met.ObserveNotification(sandboxName, serviceName, notifCellChange, notifyUrl, nil, duration)		met.ObserveNotification(sandboxName, serviceName, notifCellChange, notifyUrl, nil, duration)
	return		return
	}		}
	met.ObserveNotification(sandboxName, serviceName, notifCellChange, notifyUrl, resp, duration)		met.ObserveNotification(sandboxName, serviceName, notifCellChange, notifyUrl, resp, duration)
			defer c.Close()
	defer resp.Body.Close()		defer resp.Body.Close()
	}		}

	@@ -2270,9 +2311,9 @@ func subscriptionsPost(w http.ResponseWriter, r *http.Request) {
	subscriptionType := subscriptionCommon.SubscriptionType		subscriptionType := subscriptionCommon.SubscriptionType

	//mandatory parameter		//mandatory parameter
	if subscriptionCommon.CallbackReference == "" {		if subscriptionCommon.CallbackReference == "" && subscriptionCommon.WebsockNotifConfig.WebsocketUri == "" {
	log.Error("Mandatory CallbackReference parameter not present")		log.Error("At least one of the attributes CallbackReference or WebsockNotifConfig should be present")
	http.Error(w, "Mandatory CallbackReference parameter not present", http.StatusBadRequest)		http.Error(w, "At least one of the attributes CallbackReference or WebsockNotifConfig should be present", http.StatusBadRequest)
	return		return
	}		}

	@@ -2285,6 +2326,8 @@ func subscriptionsPost(w http.ResponseWriter, r *http.Request) {
	self.Href = hostUrl.String() + basePath + "subscriptions/" + subsIdStr		self.Href = hostUrl.String() + basePath + "subscriptions/" + subsIdStr
	link.Self = self		link.Self = self

			// TODO.. if required..

	var jsonResponse []byte		var jsonResponse []byte

	switch subscriptionType {		switch subscriptionType {

go-apps/meep-rnis/server/subscriptionCommon.go

+4 −3

Original line number	Original line	Diff line number	Diff line
	@@ -27,6 +27,7 @@ type SubscriptionCommon struct {
	Links *CaReconfSubscriptionLinks `json:"_links,omitempty"`		Links *CaReconfSubscriptionLinks `json:"_links,omitempty"`
	// URI selected by the service consumer, to receive notifications on the subscribed RNIS information. This shall be included in the request and response.		// URI selected by the service consumer, to receive notifications on the subscribed RNIS information. This shall be included in the request and response.
	CallbackReference string `json:"callbackReference,omitempty"`		CallbackReference string `json:"callbackReference,omitempty"`
			WebsockNotifConfig *WebsockNotifConfig `json:"websockNotifConfig,omitempty"`
	ExpiryDeadline *TimeStamp `json:"expiryDeadline,omitempty"`		ExpiryDeadline *TimeStamp `json:"expiryDeadline,omitempty"`
	SubscriptionType string `json:"subscriptionType"`		SubscriptionType string `json:"subscriptionType"`
	}		}

Original line number	Original line	Diff line number	Diff line
	@@ -4,11 +4,13 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03
	github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0=		github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0=
	github.com/RyanCarrier/dijkstra v0.0.0-20190726134004-b51cadb5ae52 h1:trnwuu/Q8T59kgRjXcSDBODnyZP9wes+bnLn0lx4PgM=		github.com/RyanCarrier/dijkstra v0.0.0-20190726134004-b51cadb5ae52 h1:trnwuu/Q8T59kgRjXcSDBODnyZP9wes+bnLn0lx4PgM=
	github.com/RyanCarrier/dijkstra v0.0.0-20190726134004-b51cadb5ae52/go.mod h1:DdR6ymcLl8+sN/XOVNjnYO1NDYfgHskGjreZUDuQCTY=		github.com/RyanCarrier/dijkstra v0.0.0-20190726134004-b51cadb5ae52/go.mod h1:DdR6ymcLl8+sN/XOVNjnYO1NDYfgHskGjreZUDuQCTY=
			github.com/RyanCarrier/dijkstra-1 v0.0.0-20170512020943-0e5801a26345 h1:fgSpoKViTSqRb4hjDNj10ig5wUvO0CayCzFdLf6fuRM=
	github.com/RyanCarrier/dijkstra-1 v0.0.0-20170512020943-0e5801a26345/go.mod h1:OK4EvWJ441LQqGzed5NGB6vKBAE34n3z7iayPcEwr30=		github.com/RyanCarrier/dijkstra-1 v0.0.0-20170512020943-0e5801a26345/go.mod h1:OK4EvWJ441LQqGzed5NGB6vKBAE34n3z7iayPcEwr30=
	github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo=		github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo=
	github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI=		github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI=
	github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g=		github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g=
	github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/go.mod h1:SkGFH1ia65gfNATL8TAiHDNxPzPdmEL5uirI2Uyuz6c=		github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/go.mod h1:SkGFH1ia65gfNATL8TAiHDNxPzPdmEL5uirI2Uyuz6c=
			github.com/albertorestifo/dijkstra v0.0.0-20160910063646-aba76f725f72 h1:uGeGZl8PxSq8VZGG4QK5njJTFA4/G/x5CYORvQVXtAE=
	github.com/albertorestifo/dijkstra v0.0.0-20160910063646-aba76f725f72/go.mod h1:o+JdB7VetTHjLhU0N57x18B9voDBQe0paApdEAEoEfw=		github.com/albertorestifo/dijkstra v0.0.0-20160910063646-aba76f725f72/go.mod h1:o+JdB7VetTHjLhU0N57x18B9voDBQe0paApdEAEoEfw=
	github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=		github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
	github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=		github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
	@@ -48,6 +50,7 @@ github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfc
	github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=		github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
	github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY=		github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY=
	github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=		github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
			github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
	github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=		github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
	github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=		github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
	github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=		github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
	@@ -61,6 +64,7 @@ github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7
	github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=		github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
	github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod h1:7dvUGVsVBjqR7JHJk0brhHOZYGmfBYOrK0ZhYMEtBr4=		github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod h1:7dvUGVsVBjqR7JHJk0brhHOZYGmfBYOrK0ZhYMEtBr4=
	github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod h1:ZhphrRTfi2rbfLwlschooIH4+wKKDR4Pdxhh+TRoA20=		github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod h1:ZhphrRTfi2rbfLwlschooIH4+wKKDR4Pdxhh+TRoA20=
			github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I=
	github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=		github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
	github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=		github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
	github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=		github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
	@@ -98,6 +102,7 @@ github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ
	github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=		github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
	github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=		github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
	github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=		github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
			github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4=
	github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=		github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
	github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=		github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
	github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=		github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
	@@ -112,6 +117,7 @@ github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2z
	github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=		github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=