meep-model fix to clear scenario object on SetScenario() + net-char-mgr UT updates (ab1fcdf7) · Commits · MEC - Multi-access Edge Computing / ETSI MEC Sandbox

go-packages/meep-model/model.go

+38 −15

Original line number	Diff line number	Diff line
		@@ -90,9 +90,18 @@ func NewModel(dbAddr string, module string, name string) (m *Model, err error) {
		m.ActiveChannel = ActiveScenarioEvents
		m.activeKey = activeScenarioKey
		m.scenario = new(ceModel.Scenario)
		m.nodeMap = NewNodeMap()
		m.parseNodes()
		m.updateSvcMap()
		err = m.parseNodes()
		if err != nil {
		log.Error("Failed to parse nodes for new model: ", m.name)
		log.Error(err)
		return nil, err
		}
		err = m.updateSvcMap()
		if err != nil {
		log.Error("Failed to update service map for new model: ", m.name)
		log.Error(err)
		return nil, err
		}

		// Connect to Redis DB
		m.rc, err = redis.NewConnector(dbAddr, redisTable)
		@@ -143,13 +152,25 @@ func JSONMarshallScenario(scenario []byte) (sStr string, err error) {

		// SetScenario - Initialize model from JSON string
		func (m *Model) SetScenario(j []byte) (err error) {
		err = json.Unmarshal(j, m.scenario)
		scenario := new(ceModel.Scenario)
		err = json.Unmarshal(j, scenario)
		if err != nil {
		log.Error(err.Error())
		return err
		}
		m.parseNodes()
		m.updateSvcMap()
		m.scenario = scenario

		err = m.parseNodes()
		if err != nil {
		log.Error(err.Error())
		return err
		}
		err = m.updateSvcMap()
		if err != nil {
		log.Error(err.Error())
		return err
		}

		if m.Active {
		err = m.refresh()
		if err != nil {
		@@ -188,7 +209,7 @@ func (m *Model) Activate() (err error) {

		// Deactivate - Remove the active scenario
		func (m *Model) Deactivate() (err error) {
		if m.Active == true {
		if m.Active {
		m.Active = false
		err = m.rc.JSONDelEntry(m.activeKey, ".")
		if err != nil {
		@@ -512,7 +533,7 @@ func (m *Model) updateSvcMap() (err error) {
		}

		func (m *Model) refresh() (err error) {
		if m.Active == true {
		if m.Active {
		err = m.rc.JSONDelEntry(m.activeKey, ".")
		if err != nil {
		log.Error(err.Error())
		@@ -561,7 +582,7 @@ func (m Model) movePL(node Node, destName string) (oldLocName string, newLocNa
		// fmt.Printf("+++ newNL: %+v\n", newNL)

		// Update location if necessary
		if pl != nil && oldNL != nil && newNL != nil && oldNL != newNL {
		if pl != nil && oldNL != newNL {
		log.Debug("Found PL & destination. Updating PL location.")

		// Add PL to new location
		@@ -582,7 +603,10 @@ func (m Model) movePL(node Node, destName string) (oldLocName string, newLocNa
		oldNL.PhysicalLocations = oldNL.PhysicalLocations[:len(oldNL.PhysicalLocations)-1]

		// refresh pointers
		m.parseNodes()
		err = m.parseNodes()
		if err != nil {
		log.Error(err.Error())
		}
		}

		return oldNL.Name, newNL.Name, nil
		@@ -618,7 +642,7 @@ func (m Model) moveProc(node Node, destName string) (oldLocName string, newLoc
		// fmt.Printf("+++ newNL: %+v\n", newNL)

		// Update location if necessary
		if proc != nil && oldPL != nil && newPL != nil && oldPL != newPL {
		if proc != nil && oldPL != newPL {
		log.Debug("Found Process & destination. Updating PL location.")

		// Add PL to new location
		@@ -651,11 +675,10 @@ func (m *Model) internalListener(channel string, payload string) {
		log.Debug("Scenario was deleted")
		// Scenario was deleted
		m.scenario = new(ceModel.Scenario)
		m.nodeMap = NewNodeMap()
		m.parseNodes()
		m.updateSvcMap()
		_ = m.parseNodes()
		_ = m.updateSvcMap()
		} else {
		m.SetScenario([]byte(j))
		_ = m.SetScenario([]byte(j))
		}

		// external listener

go-packages/meep-model/model_test.go

+12 −10

Original line number	Diff line number	Diff line
		@@ -109,13 +109,6 @@ func TestGetSetScenario(t *testing.T) {
		if svcMap == nil {
		t.Errorf("Service map expected")
		}

		fmt.Println("Set Model - deleted scenario")
		m.scenario = nil
		err = m.SetScenario([]byte(testScenario))
		if err == nil {
		t.Errorf("SetScenario should have failed (nil scenario)")
		}
		}

		func TestActivateDeactivate(t *testing.T) {
		@@ -610,7 +603,10 @@ func TestListenModel(t *testing.T) {
		}

		fmt.Println("Activate")
		mPub.Activate()
		err = mPub.Activate()
		if err != nil {
		t.Errorf("Failed to activate model")
		}
		time.Sleep(50 * time.Millisecond)

		fmt.Println("Set Model")
		@@ -716,7 +712,10 @@ func TestListenModel(t *testing.T) {

		fmt.Println("Dectivate")
		testCount++
		mPub.Deactivate()
		err = mPub.Deactivate()
		if err != nil {
		t.Errorf("Failed to deactivate")
		}
		time.Sleep(50 * time.Millisecond)
		if eventCount != testCount {
		t.Errorf("No event received for Activate")
		@@ -734,7 +733,10 @@ func TestListenModel(t *testing.T) {

		fmt.Println("Re-Activate")
		testCount++
		mPub.Activate()
		err = mPub.Activate()
		if err != nil {
		t.Errorf("Failed to activate")
		}
		time.Sleep(50 * time.Millisecond)
		if eventCount != testCount {
		t.Errorf("No event received for Activate")

go-packages/meep-net-char-mgr/algo-segment.go

+0 −7

Original line number	Diff line number	Diff line
		@@ -247,13 +247,6 @@ func (algo *SegmentAlgorithm) CalculateNetChar() []FlowNetChar {
		algo.reCalculateThroughputs()
		algo.logTimeLapse(&currentTime, "time to recalculate")

		if flowLog, ok := algo.FlowMap["ue1-iperf:zone1-fog1-iperf"]; ok {
		log.Error(printFlow(flowLog))
		}
		if flowLog, ok := algo.FlowMap["ue1-iperf:zone2-edge1-iperf"]; ok {
		log.Error(printFlow(flowLog))
		}

		// Prepare list of updated flows
		for _, flow := range algo.FlowMap {
		if flow.MaxPlannedThroughput != flow.AllocatedThroughput && flow.MaxPlannedThroughput != MAX_THROUGHPUT {

go-packages/meep-net-char-mgr/algo-segment_test.go

+237 −227

File changed.

Preview size limit exceeded, changes collapsed.