Commit 5c263328 authored by M. Rehan Abbasi's avatar M. Rehan Abbasi
Browse files

add traffic manager handling code in VIS SBI

parent b0a44ebc

go-apps/meep-vis/go.mod

+2 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ require ( 
	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-service-mgmt-client v0.0.0

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

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

	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-vis-traffic-mgr v0.0.0

	github.com/gorilla/handlers v1.5.1

	github.com/gorilla/mux v1.8.0

	github.com/prometheus/client_golang v1.9.0
@@ -40,5 +41,6 @@ replace ( 
	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-service-mgmt-client => ../../go-packages/meep-service-mgmt-client

	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-vis-traffic-mgr => ../../go-packages/meep-vis-traffic-mgr

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

)

go-apps/meep-vis/go.sum

+2 −0
Original line number Diff line number Diff line
@@ -176,6 +176,8 @@ github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORN 
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=

github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=

github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=

github.com/lib/pq v1.5.2 h1:yTSXVswvWUOQ3k1sd7vJfDrbSl8lKuscqFJRqjC0ifw=

github.com/lib/pq v1.5.2/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=

github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743/go.mod h1:qklhhLq1aX+mtWk9cPHPzaBjWImj5ULL6C7HFJtXQMM=

github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod h1:jlF1pusYV4pidLvZ+XD0UBX0ZE6WURAspgAczcDHrL4=

github.com/lyft/protoc-gen-validate v0.0.13/go.mod h1:XbGvPuh87YZc5TdIa2/I4pLk0QoUACkjt2znoq26NVQ=

go-apps/meep-vis/sbi/vis-sbi.go

+36 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import ( 
	mod "github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-model"

	mq "github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-mq"

	sam "github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-swagger-api-mgr"

	tm "github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-vis-traffic-mgr"

)



const moduleName string = "meep-vis-sbi"
@@ -34,6 +35,9 @@ var metricStore *met.MetricStore 
var redisAddr string = "meep-redis-master.default.svc.cluster.local:6379"

var influxAddr string = "http://meep-influxdb.default.svc.cluster.local:8086"



const postgisUser = "postgres"

const postgisPwd = "pwd"



type SbiCfg struct {

	ModuleName     string

	SandboxName    string
@@ -59,6 +63,7 @@ type VisSbi struct { 
	apiMgr               *sam.SwaggerApiMgr

	activeModel          *mod.Model

	gisCache             *gc.GisCache

	trafficMgr           *tm.TrafficMgr

	updateScenarioNameCB func(string)

	cleanUpCB            func()

	mutex                sync.Mutex
@@ -132,6 +137,25 @@ func Init(cfg SbiCfg) (err error) { 
	}

	log.Info("Connected to GIS Cache")



	// Connect to VIS Traffic Manager

	sbi.trafficMgr, err = tm.NewTrafficMgr(moduleName, sbi.sandboxName, postgisUser, postgisPwd, "", "")

	if err != nil {

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

		return err

	}

	log.Info("Connected to VIS Traffic Manager")



	// Delete any old tables

	_ = sbi.trafficMgr.DeleteTables()



	// Create new tables

	err = sbi.trafficMgr.CreateTable()

	if err != nil {

		log.Error("Failed to create table: ", err)

		return err

	}

	log.Info("Created new VIS DB table")



	// Initialize service

	processActiveScenarioUpdate()
@@ -192,6 +216,15 @@ func Stop() (err error) { 
		}

	}



	// Delete VIS Traffic Manager

	if sbi.trafficMgr != nil {

		err = sbi.trafficMgr.DeleteTrafficMgr()

		if err != nil {

			log.Error(err.Error())

			return err

		}

	}



	return nil

}
@@ -218,6 +251,9 @@ func processActiveScenarioTerminate() { 
	// Sync with active scenario store

	sbi.activeModel.UpdateScenario()



	// Flush all Traffic Manger tables

	_ = sbi.trafficMgr.DeleteTables()



	sbi.cleanUpCB()

}