Commit c2c625bf authored by Yann Garcia's avatar Yann Garcia
Browse files

Add create/delete IOT

parent 18cbd38c

go-apps/meep-iot/go.mod

+2 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ require ( 
	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-redis 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-sss-mgr v0.0.0 // indirect

	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-subscriptions v0.0.0 // indirect

	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-swagger-api-mgr v0.0.0

	github.com/gorilla/handlers v1.5.1
@@ -37,6 +38,7 @@ replace ( 
	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-redis => ../../go-packages/meep-redis

	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-sandbox-ctrl-client => ../../go-packages/meep-sandbox-ctrl-client

	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-service-mgmt-client => ../../go-packages/meep-service-mgmt-client

	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-sss-mgr => ../../go-packages/meep-sss-mgr

	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-subscriptions => ../../go-packages/meep-subscriptions

	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-swagger-api-mgr => ../../go-packages/meep-swagger-api-mgr

	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-websocket => ../../go-packages/meep-websocket

go-apps/meep-sss/sbi/sss-sbi.go

+16 −1
Original line number Diff line number Diff line
@@ -60,6 +60,11 @@ type SbiCfg struct { 
	RedisAddr       string

	InfluxAddr      string

	Locality        []string

	Protocol        string

	Host            string

	Port            int

	HostId          string

	Name            string

	DiscoveryNotify func()

	StatusNotify    func()

	DataNotify      func()
@@ -79,6 +84,11 @@ type SssSbi struct { 
	apiMgr               *sam.SwaggerApiMgr

	activeModel          *mod.Model

	sssMgr               *tm.SssMgr

	protocol             string

	host                 string

	port                 int

	hostId               string

	name                 string

	discoveryNotify      func()

	statusNotify         func()

	dataNotify           func()
@@ -103,6 +113,11 @@ func Init(cfg SbiCfg) (err error) { 
	sbi.scenarioName = ""

	sbi.updateScenarioNameCB = cfg.ScenarioNameCb

	sbi.cleanUpCB = cfg.CleanUpCb

	sbi.protocol = cfg.Protocol

	sbi.host = cfg.Host

	sbi.port = cfg.Port

	sbi.hostId = cfg.HostId

	sbi.name = cfg.Name

	sbi.discoveryNotify = cfg.DiscoveryNotify

	sbi.statusNotify = cfg.StatusNotify

	sbi.dataNotify = cfg.DataNotify
@@ -149,7 +164,7 @@ func Init(cfg SbiCfg) (err error) { 
	}



	// Connect to SSS Manager

	sbi.sssMgr, err = tm.NewSssMgr(sbi.moduleName, sbi.sandboxName, sbi.discoveryNotify, sbi.statusNotify, sbi.dataNotify)

	sbi.sssMgr, err = tm.NewSssMgr(sbi.moduleName, sbi.sandboxName, sbi.protocol, sbi.host, sbi.port, sbi.hostId, sbi.name, sbi.discoveryNotify, sbi.statusNotify, sbi.dataNotify)

	if err != nil {

		log.Error("Failed connection to SSS Manager: ", err)

		return err

go-apps/meep-sss/server/meep-sss.go

+11 −0
Original line number Diff line number Diff line
@@ -112,6 +112,12 @@ var mutex sync.Mutex 
var expiryTicker *time.Ticker

var nextSubscriptionIdAvailable int



var iot_platform_address string = "lab-oai.etsi.org"

var iot_platform_port int = 31110

var cse_name string = "laboai-acme-ic-cse"

var iot_platform_id string = "7feaadbb0400"

var iot_platform_protocol string = "HTTP"



func getAppInstanceId() (id string, err error) {

	var appInfo scc.ApplicationInfo

	appInfo.Id = instanceId
@@ -384,6 +390,11 @@ func Init() (err error) { 
		Locality:        locality,

		ScenarioNameCb:  updateStoreName,

		CleanUpCb:       cleanUp,

		Protocol:        iot_platform_protocol,

		Host:            iot_platform_address,

		Port:            iot_platform_port,

		Name:            cse_name,

		HostId:          iot_platform_id,

		DiscoveryNotify: discoveryNotify,

		StatusNotify:    statusNotify,

		DataNotify:      dataNotify,

go-packages/meep-iot-mgr/go.mod

+3 −1
Original line number Diff line number Diff line
@@ -14,4 +14,6 @@ require ( 


)



replace github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-logger => ../../go-packages/meep-logger
 
replace (

	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-logger => ../../go-packages/meep-logger

)

go-packages/meep-iot-mgr/go.sum

+1 −0
Original line number Diff line number Diff line 
github.com/BurntSushi/toml v1.2.0 h1:Rt8g24XnyGTyglgET/PRUNlrUeu9F5L+7FilkXfZgs0=

github.com/BurntSushi/toml v1.2.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=

github.com/InterDigitalInc/AdvantEDGE v1.9.2 h1:CAcF+bn5m0Va2mHFL2lE4awU/kjuF6CjC05phiz8vnk=

github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=

github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=

github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk=