Commit 3f072712 authored by Kevin Di Lallo's avatar Kevin Di Lallo
Browse files

Merge branch 'release-1.4.0' into develop

parents 987b4017 379f51b6

.meepctl-repocfg.yaml

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
# See the License for the specific language governing permissions and

# limitations under the License.



version: 1.3.1

version: 1.4.0

repo:

  name: AdvantEDGE

  core:

go-apps/meepctl/cmd/version.go

+5 −5
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ type versionInfo struct { 
	BuildID   string `json:"build,omitempty"`

}



const meepctlVersion = "1.3.1"

const meepctlVersion = "1.4.0"

const na = "NA"



var corePodsNameMap = []string{
@@ -108,11 +108,11 @@ var corePodsNameMap = []string{ 
	"meep-redis",

	"meep-tc-engine",

	"meep-loc-serv",

	"meep-grafana",

	"meep-influxdb",

	"meep-couchdb",

	"meep-kube-state-metrics",

	"meep-docker-registry",

	"grafana",

	"couchdb",

	"kube-state-metrics",

	"docker-registry",

}



var depPodsNameMap = []string{"weave"}

go-apps/meepctl/utils/config.go

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ import ( 
	yaml "gopkg.in/yaml.v2"

)



const configVersion string = "1.3.1"

const configVersion string = "1.4.0"



const defaultNotSet string = "not set"

const defaultIP string = ""

go-packages/meep-model/validator.go

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ const ( 
)



var DefaultVersion = semver.Version{Major: 1, Minor: 0, Patch: 0}

var ValidatorVersion = semver.Version{Major: 1, Minor: 3, Patch: 0}

var ValidatorVersion = semver.Version{Major: 1, Minor: 4, Patch: 0}



// ValidateScenario - Verify if json scenario is valid & supported. Upgrade scenario if possible & necessary.

func ValidateScenario(jsonScenario []byte) (validJsonScenario []byte, status string, err error) {

go-packages/meep-replay-manager/replayMgr.go

+25 −43
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ import ( 
	log "github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-logger"

)



const defaultLoopInterval = 1000 //in ms

const defaultLoopInterval = 5000 //in ms

const basepath = "http://meep-ctrl-engine/v1"



type ReplayMgr struct {
@@ -87,26 +87,27 @@ func NewReplayMgr(name string) (r *ReplayMgr, err error) { 
}



func (r *ReplayMgr) playEventByIndex() error {



	// Retrieve & Marshal next event

	index := r.nextEventIndex

	nextIndex := 0

	replayEvent := r.replayEventsList.Events[index]



	j, err := json.Marshal(&replayEvent.Event)

	if err != nil {

		log.Error(err)

		return err

	}



	// If first event, take timestamp for reference

	if index == 0 {

		r.loopStarted = time.Now()

	}



	// Process INIT event

	isInitEvent := false

	if replayEvent.Event.Type_ == "OTHER" && replayEvent.Event.Name == "Init" {

		isInitEvent = true

	}



	if isInitEvent && r.ignoreInitEvent {

		// Skip to next event if INIT event should be ignored

		if r.ignoreInitEvent {

			index = index + 1

			replayEvent = r.replayEventsList.Events[index]
@@ -115,9 +116,12 @@ func (r *ReplayMgr) playEventByIndex() error { 
				log.Error(err)

				return err

			}

		} else {

			isInitEvent = true

		}

	}



	//only send events that mean something for the scenario

	// Send event (except INIT event)

	if !isInitEvent {

		vars := make(map[string]string)

		vars["type"] = replayEvent.Event.Type_
@@ -135,7 +139,8 @@ func (r *ReplayMgr) playEventByIndex() error { 
		}

	}



	//see if we have a next event, if we are done or if we loop

	// Retrieve index of next event

	nextIndex := 0

	if index != r.eventIndexMax {

		nextIndex = index + 1

	} else if r.loop {
@@ -144,54 +149,31 @@ func (r *ReplayMgr) playEventByIndex() error { 
		nextIndex = -1

	}



	//sending the ticker prior to processing the current event to minimize time lost

	// If necessary, create timer to wait before sending next event

	if nextIndex != -1 {

		nextReplayEvent := r.replayEventsList.Events[nextIndex]

		//durations are all relative to event0.... need to be updated based on current time

		//act otherwise if execution is a circular loop



		// Calculate time until next event

		var diff int32

		if nextIndex == 0 {

			diff = defaultLoopInterval

		} else {

			diff = nextReplayEvent.Time - replayEvent.Time

		}

		r.nextEventIndex = nextIndex

		tickerExpiry := time.Duration(diff) * time.Millisecond

		log.Debug("next replay event (index ", nextReplayEvent.Index, ") in ", tickerExpiry)

		r.ticker = time.NewTicker(tickerExpiry)



		r.timeToNextEvent, r.timeRemaining = r.getTimesRemaining()

		r.nextEventIndex = nextIndex



		// Start timer

		go func() {

			for range r.ticker.C {

				r.ticker.Stop()

				_ = r.playEventByIndex()

			}

		}()

	}



	//only send events that mean something for the scenario

	if replayEvent.Event.Type_ != "INIT" {



		vars := make(map[string]string)



		vars["type"] = replayEvent.Event.Type_



		var validEvent ce.Event



		err = json.Unmarshal(j, &validEvent)

		if err != nil {

			log.Error(err)

			return err

		}



		_, err = r.client.ScenarioExecutionApi.SendEvent(context.TODO(), replayEvent.Event.Type_, validEvent)

		if err != nil {

			log.Error(err)

		}

	}



	if nextIndex == -1 {

	} else {

		r.Completed()

	}