simple pr review comment, changes for ut to pass, update to the algo for... (210e8b98) · Commits · MEC - Multi-access Edge Computing / ETSI MEC Sandbox

go-packages/meep-model/model_test.go

+154 −103

File changed.

Preview size limit exceeded, changes collapsed.

go-packages/meep-model/validator.go

+7 −6

Original line number	Diff line number	Diff line
		@@ -386,12 +386,13 @@ func validatePL(pl *dataModel.PhysicalLocation) error {
		if pl.Type_ != NodeTypeUE {
		return errors.New("Unsupported PL Type: " + pl.Type_)
		}
		if pl.NetChar != nil {
		if pl.NetChar.ThroughputDl == 0 {
		pl.NetChar.ThroughputDl = 1000
		}
		if pl.NetChar.ThroughputUl == 0 {
		pl.NetChar.ThroughputUl = 1000
		}

		}
		return nil
		}

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

+27 −216

Original line number	Diff line number	Diff line
		@@ -421,12 +421,6 @@ func (algo SegmentAlgorithm) populateFlow(flowName string, srcElement SegAlgoN
		} else {
		maxBw = destElement.ConfiguredNetChar.ThroughputDl
		}
		/* if srcElement.ConfiguredNetChar.ThroughputDl < destElement.ConfiguredNetChar.ThroughputUl {
		maxBwDl = srcElement.ConfiguredNetChar.ThroughputDl
		} else {
		maxBwDl = destElement.ConfiguredNetChar.ThroughputUl
		}
		*/
		}

		flow.ConfiguredNetChar.Throughput = maxBw
		@@ -547,201 +541,19 @@ func (algo SegmentAlgorithm) createPath(flowName string, srcElement SegAlgoNet
		return path
		}

		//cloud ul, dl
		if srcElement.Type == "DC" {
		direction = "uplink"
		segment = algo.createSegment(model.GetScenarioName() + "-cloud-", direction, flowName, model)
		path.Segments = append(path.Segments, segment)

		}

		if destElement.Type == "DC" {
		direction = "downlink"
		segment = algo.createSegment(model.GetScenarioName() + "-cloud-", direction, flowName, model)
		path.Segments = append(path.Segments, segment)

		}

		return path
		}

		/*

		// createPath -
		func (algo SegmentAlgorithm) createPath(flowName string, srcElement SegAlgoNetElem, destElement SegAlgoNetElem, model mod.Model) *SegAlgoPath {
		//interdomain

		//Tier 1 -- check if they are in the same poa
		//Tier 2 -- check if they are in the same zone, but different poa
		//Tier 3 -- check if they are in the same domain, but different zone
		//Tier 4 -- check if they are in different domains

		direction := ""
		segmentName := ""
		var segment *SegAlgoSegment

		path := new(SegAlgoPath)
		path.Name = flowName

		//Tier 1
		if srcElement.PoaName != "" {
		//segments from element to POA
		//2 possibilities
		//UE->POA
		//segments for srcElement(app) -> 1A. UE-Node uplink-> 2A. POA-TermLink uplink
		//FOG-POA
		//segments for srcElement(app) -> 1B. FogNode uplink
		//computing twice while in the interdomain
		direction = "uplink"
		//segment 1A or 1B
		segmentName = srcElement.PhyLocName + "-" + direction
		segment = algo.createSegment(segmentName, flowName, srcElement.PhyLocName, model)
		segment = algo.createSegment(model.GetScenarioName(), direction, flowName, model)
		path.Segments = append(path.Segments, segment)

		if srcElement.Type == "UE" {
		//segment 2A
		segmentName = srcElement.PoaName + "-" + direction
		segment = algo.createSegment(segmentName, flowName, srcElement.PoaName, model)
		path.Segments = append(path.Segments, segment)
		}
		}

		if destElement.PoaName != "" {
		//segments from POA to element
		//2 possibilities
		//POA->FOG
		//3A. Fog-Node downlink -> dstElement(app)
		//POA-UE
		//2B. POA-TermLink downlink -> 3B. UE-Node downlink -> dstElement(app)
		direction = "downlink"
		if destElement.Type == "UE" {
		//segment 2B
		segmentName = destElement.PoaName + "-" + direction
		segment = algo.createSegment(segmentName, flowName, destElement.PoaName, model)
		segment = algo.createSegment(model.GetScenarioName(), direction, flowName, model)
		path.Segments = append(path.Segments, segment)
		}

		//segment 3A or 3B
		segmentName = destElement.PhyLocName + "-" + direction
		segment = algo.createSegment(segmentName, flowName, destElement.PhyLocName, model)
		path.Segments = append(path.Segments, segment)
		}

		//Tier 2
		//if same zone, different POA, OR no POA at all (Edge-Edge)
		if (srcElement.PoaName != destElement.PoaName) \|\| (srcElement.PoaName == "" && destElement.PoaName == "") {
		//segments to intraZone backbone
		//2 possibilities
		//EDGE->IntraZoneBackbone
		//srcElement(app) -> 1A. Edge-Node uplink -> 2A. IntraZone uplink
		//POA->IntraZoneBackbone
		//2B. IntraZone uplink
		direction = "uplink"
		if srcElement.Type == "EDGE" {
		//segment 1A
		segmentName = srcElement.PhyLocName + "-" + direction
		segment = algo.createSegment(segmentName, flowName, srcElement.PhyLocName, model)
		path.Segments = append(path.Segments, segment)

		//segment 2A
		segmentName = srcElement.ZoneName + "-" + srcElement.PhyLocName + "-" + direction
		} else {
		//segment 2B
		segmentName = srcElement.ZoneName + "-" + srcElement.PoaName + "-" + direction
		}
		if srcElement.ZoneName != "" {
		segment = algo.createSegment(segmentName, flowName, srcElement.ZoneName, model)
		path.Segments = append(path.Segments, segment)
		}

		//segments from intraZone backbone
		//2 possibilities
		//IntraZoneBackbone->EDGE
		//3A. IntraZone downlink -> 4A. Edge-Node downlink -> srcElement(app)
		//IntraZoneBackbone->POA
		//3B. IntraZone downlink
		direction = "downlink"
		if destElement.Type == "EDGE" {
		//segment 4A
		segmentName = destElement.PhyLocName + "-" + direction
		segment = algo.createSegment(segmentName, flowName, destElement.PhyLocName, model)
		path.Segments = append(path.Segments, segment)

		//segment 3A
		segmentName = destElement.ZoneName + "-" + destElement.PhyLocName + "-" + direction
		} else {
		//segment 3B
		segmentName = destElement.ZoneName + "-" + destElement.PoaName + "-" + direction
		}
		if destElement.ZoneName != "" {
		segment = algo.createSegment(segmentName, flowName, destElement.ZoneName, model)
		path.Segments = append(path.Segments, segment)
		}
		}

		//Tier 3
		if srcElement.ZoneName != destElement.ZoneName {
		//segments to interZone backbone
		//1 possibility
		//Zone->InterZoneBackbone
		//1A. Zone uplink -> InterZone backbone (if zone exist)
		direction = "uplink"
		//segment 1A
		if srcElement.ZoneName != "" {
		segmentName = srcElement.ZoneName + "-" + direction
		segment = algo.createSegment(segmentName, flowName, srcElement.DomainName, model)
		path.Segments = append(path.Segments, segment)
		}

		//segments from interZone backbone
		//1 possibility
		//InterZoneBackbone->Zone
		//2A. InterZone backbone -> Zone downlink (if zone exist)
		direction = "downlink"
		//segment 2A
		if destElement.ZoneName != "" {
		segmentName = destElement.ZoneName + "-" + direction
		segment = algo.createSegment(segmentName, flowName, destElement.DomainName, model)
		path.Segments = append(path.Segments, segment)
		}
		}

		//Tier 4
		if srcElement.DomainName != destElement.DomainName {
		//segments to interDomain backbone
		//1 possibility
		//InterZoneBackbone->InterDomainBackbone
		//1A. InterZone backbone -> Domain backbone
		direction = "uplink"
		//segment 1A
		segmentName = srcElement.DomainName + "-" + direction
		segment = algo.createSegment(segmentName, flowName, model.GetScenarioName(), model)
		path.Segments = append(path.Segments, segment)

		//segments from interDomain backbone
		//1 possibility
		//InterDomainBackbone->InterZoneBackbone
		//2A. Domain backbone -> InterZone backbone
		direction = "downlink"
		//segment 2A
		segmentName = destElement.DomainName + "-" + direction
		segment = algo.createSegment(segmentName, flowName, model.GetScenarioName(), model)
		path.Segments = append(path.Segments, segment)

		//when going through interdomain, either from/to the cloud or another domain, if not cloud, already handled in other tiers sections
		if destElement.Type == "CLOUD" {
		segmentName = destElement.PhyLocName + "-" + direction
		segment = algo.createSegment(segmentName, flowName, destElement.PhyLocName, model)
		path.Segments = append(path.Segments, segment)
		} else if srcElement.Type == "CLOUD" {
		direction = "uplink"
		segmentName = srcElement.PhyLocName + "-" + direction
		segment = algo.createSegment(segmentName, flowName, srcElement.PhyLocName, model)
		path.Segments = append(path.Segments, segment)
		}
		}

		return path
		}
		*/

		// createSegment -
		func (algo SegmentAlgorithm) createSegment(elemName string, direction string, flowName string, model mod.Model) *SegAlgoSegment {
		@@ -1023,7 +835,7 @@ func updateMaxFairShareBwPerFlow(segment *SegAlgoSegment) {
		}

		// getNetChars - Retrieve all network characteristics from model for provided element name
		func getNetChars(elemName string, model mod.Model) (dataModel.NetworkCharacteristics) {
		func getNetChars(elemName string, model mod.Model) dataModel.NetworkCharacteristics {

		nc := new(dataModel.NetworkCharacteristics)

		@@ -1106,7 +918,6 @@ func printFlow(flow *SegAlgoFlow) string {
		s8p := fmt.Sprintf("%f", flow.AppliedNetChar.PacketLoss)
		s8d := flow.AppliedNetChar.Distribution


		str := s1 + ": " + "Current: " + s6 + " - Configured: [" + s2t + "-" + s2l + "-" + s2j + "-" + s2p + "-" + s2d + "] Allocated: " + s3a + "[" + s4a + "-" + s5a + "]" + " - MaxPlanned: " + s3m + "[" + s4m + "-" + s5m + "]" + " - Planned: " + s3p + "[" + s4p + "-" + s5p + "] Computed Net Char: [" + s7l + "-" + s7j + "-" + s7p + "] Applied Net Char: [" + s8l + "-" + s8j + "-" + s8p + "-" + s8d + "]"
		str += printPath(flow.Path)
		return str

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

+10 −4

File changed.

Preview size limit exceeded, changes collapsed.

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

+11 −11

Original line number	Diff line number	Diff line
		@@ -286,7 +286,7 @@ func (ncm *NetCharManager) updateNetChars() {
		if len(updatedNetCharList) != 0 {
		for _, flowNetChar := range updatedNetCharList {
		if ncm.netCharUpdateCb != nil {
		ncm.netCharUpdateCb(flowNetChar.DstElemName, flowNetChar.SrcElemName, flowNetChar.MyNetChar.Throughput, flowNetChar.MyNetChar.Latency, flowNetChar.MyNetChar.Jitter, flowNetChar.MyNetChar.Distribution,/flowNetChar.MyNetChar.Distribution,/ flowNetChar.MyNetChar.PacketLoss)
		ncm.netCharUpdateCb(flowNetChar.DstElemName, flowNetChar.SrcElemName, flowNetChar.MyNetChar.Throughput, flowNetChar.MyNetChar.Latency, flowNetChar.MyNetChar.Jitter, flowNetChar.MyNetChar.Distribution /flowNetChar.MyNetChar.Distribution,/, flowNetChar.MyNetChar.PacketLoss)
		}
		}
		if ncm.updateCompleteCb != nil {

go-packages/meep-model/model.go

+13 −13

File changed.

Contains only whitespace changes.