Merge branch 'release-1.3.0' into develop (cf327e4b) · Commits · MEC - Multi-access Edge Computing / ETSI MEC Sandbox

.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.2.0
		version: 1.3.0
		repo:
		name: AdvantEDGE
		core:

go-apps/meep-mg-manager/server/mg-manager.go

+64 −0

Original line number	Diff line number	Diff line
		@@ -1318,3 +1318,67 @@ func mgTransferAppState(w http.ResponseWriter, r *http.Request) {
		w.Header().Set("Content-Type", "application/json; charset=UTF-8")
		w.WriteHeader(http.StatusOK)
		}

		// func mgmDebug(str string) {
		// log.Debug("+++++ " + str + " +++++")
		// log.Debug("+++ netLocList:")
		// for _, netLoc := range mgm.netLocList {
		// log.Debug(" " + netLoc)
		// }
		// log.Debug("+++ svcInfoMap:")
		// for svcName, svcInfo := range mgm.svcInfoMap {
		// log.Debug(" " + svcName + ":" + svcInfo.name + ":" + svcInfo.node)
		// }
		// log.Debug("+++ mgSvcInfoMap:")
		// for mgSvcName, mgSvcInfo := range mgm.mgSvcInfoMap {
		// log.Debug(" " + mgSvcName + ":")
		// log.Debug(" services:")
		// for k := range mgSvcInfo.services {
		// log.Debug(" " + k)
		// }
		// }
		// log.Debug("+++ svcToElemMap:")
		// for k, v := range mgm.svcToElemMap {
		// log.Debug(" " + k + ":" + v)
		// }
		// log.Debug("+++ elemToSvcMap:")
		// for k, v := range mgm.elemToSvcMap {
		// log.Debug(" " + k + ":" + v)
		// }
		// log.Debug("+++ netElemInfoMap:")
		// for netElemName, netElemInfo := range mgm.netElemInfoMap {
		// log.Debug(" " + netElemName + ":")
		// log.Debug(" name: " + netElemInfo.name)
		// log.Debug(" phyLoc: " + netElemInfo.phyLoc)
		// log.Debug(" netLoc: " + netElemInfo.netLoc)
		// log.Debug(" netLocsInRange:")
		// for k := range netElemInfo.netLocsInRange {
		// log.Debug(" " + k)
		// }
		// log.Debug(" mgSvcMap:")
		// for k := range netElemInfo.mgSvcMap {
		// log.Debug(" " + k)
		// }
		// }
		// log.Debug("+++ mgInfoMap:")
		// for mgInfoName, mgInfo := range mgm.mgInfoMap {
		// log.Debug(" " + mgInfoName + ":")
		// log.Debug(" netLocAppMap:")
		// for k, v := range mgInfo.netLocAppMap {
		// log.Debug(" " + k + ":" + v)
		// }
		// log.Debug(" defaultNetLocAppMap:")
		// for k, v := range mgInfo.defaultNetLocAppMap {
		// log.Debug(" " + k + ":" + v)
		// }
		// log.Debug(" appInfoMap:")
		// for k := range mgInfo.appInfoMap {
		// log.Debug(" " + k)

		// }
		// log.Debug(" ueInfoMap:")
		// for k := range mgInfo.ueInfoMap {
		// log.Debug(" " + k)
		// }
		// }
		// }

go-apps/meepctl/cmd/version.go

+1 −1

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

		const meepctlVersion = "1.2.0"
		const meepctlVersion = "1.3.0"
		const na = "NA"

		var corePodsNameMap = []string{

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.2.0"
		const configVersion string = "1.3.0"

		const defaultNotSet string = "not set"
		const defaultIP string = ""

go-packages/meep-model/model.go

+19 −5

Original line number	Diff line number	Diff line
		@@ -461,35 +461,35 @@ func (m *Model) parseNodes() (err error) {
		domain := &m.scenario.Deployment.Domains[iDomain]
		ctx := NewNodeContext(m.scenario.Name, domain.Name, "", "", "")
		m.nodeMap.AddNode(NewNode(domain.Name, domain.Type_, domain, &domain.Zones, m.scenario.Deployment, ctx))
		m.networkGraph.AddNode(domain.Name, "")
		m.networkGraph.AddNode(domain.Name, "", false)

		// Zones
		for iZone := range domain.Zones {
		zone := &domain.Zones[iZone]
		ctx := NewNodeContext(m.scenario.Name, domain.Name, zone.Name, "", "")
		m.nodeMap.AddNode(NewNode(zone.Name, zone.Type_, zone, &zone.NetworkLocations, domain, ctx))
		m.networkGraph.AddNode(zone.Name, domain.Name)
		m.networkGraph.AddNode(zone.Name, domain.Name, isDefaultZone(zone.Type_))

		// Network Locations
		for iNL := range zone.NetworkLocations {
		nl := &zone.NetworkLocations[iNL]
		ctx := NewNodeContext(m.scenario.Name, domain.Name, zone.Name, nl.Name, "")
		m.nodeMap.AddNode(NewNode(nl.Name, nl.Type_, nl, &nl.PhysicalLocations, zone, ctx))
		m.networkGraph.AddNode(nl.Name, zone.Name)
		m.networkGraph.AddNode(nl.Name, zone.Name, isDefaultNetLoc(nl.Type_))

		// Physical Locations
		for iPL := range nl.PhysicalLocations {
		pl := &nl.PhysicalLocations[iPL]
		ctx := NewNodeContext(m.scenario.Name, domain.Name, zone.Name, nl.Name, pl.Name)
		m.nodeMap.AddNode(NewNode(pl.Name, pl.Type_, pl, &pl.Processes, nl, ctx))
		m.networkGraph.AddNode(pl.Name, nl.Name)
		m.networkGraph.AddNode(pl.Name, nl.Name, false)

		// Processes
		for iProc := range pl.Processes {
		proc := &pl.Processes[iProc]
		ctx := NewNodeContext(m.scenario.Name, domain.Name, zone.Name, nl.Name, pl.Name)
		m.nodeMap.AddNode(NewNode(proc.Name, proc.Type_, proc, nil, pl, ctx))
		m.networkGraph.AddNode(proc.Name, pl.Name)
		m.networkGraph.AddNode(proc.Name, pl.Name, false)

		// Update service map for external processes
		if proc.IsExternal {
		@@ -655,3 +655,17 @@ func (m *Model) internalListener(channel string, payload string) {
		// external listener
		m.listener(channel, payload)
		}

		func isDefaultZone(typ string) bool {
		if typ == "COMMON" {
		return true
		}
		return false
		}

		func isDefaultNetLoc(typ string) bool {
		if typ == "DEFAULT" {
		return true
		}
		return false
		}