Merge pull request #159 from nikhildoifode/na-926 (b5cfb3e7) · Commits · MEC - Multi-access Edge Computing / ETSI MEC Sandbox

go-apps/meep-mon-engine/server/mon-engine.go

+8 −6

Original line number	Diff line number	Diff line
		@@ -474,9 +474,9 @@ func meGetStates(w http.ResponseWriter, r *http.Request) {
		}
		}
		if querySandbox != "" \|\| querySandbox == "all" {
		for k, v := range expectedSboxPods {
		for _, v := range expectedSboxPods {
		if v.Sandbox == querySandbox \|\| querySandbox == "all" {
		data.ExpectedPods[k] = v
		data.ExpectedPods[v.Name] = v
		}
		}
		}
		@@ -608,13 +608,15 @@ func getPodName(app string, name string) string {
		func addExpectedPods(sandboxName string) {
		for _, pod := range sboxPodsList {
		// Get sandbox-specific pod name
		var podName string
		var podName, podKeyName string
		prefix := "meep-"
		sandboxPrefix := prefix + sandboxName + "-"
		if strings.HasPrefix(pod, prefix) {
		podName = sandboxPrefix + pod[len(prefix):]
		podName = pod
		podKeyName = sandboxPrefix + pod[len(prefix):]
		} else {
		podName = sandboxPrefix + pod
		podName = prefix + pod
		podKeyName = sandboxPrefix + pod
		}

		// Add to expected sandbox pods list
		@@ -623,7 +625,7 @@ func addExpectedPods(sandboxName string) {
		podStatus.Sandbox = sandboxName
		podStatus.Name = podName
		podStatus.LogicalState = "NotAvailable"
		expectedSboxPods[podName] = podStatus
		expectedSboxPods[podKeyName] = podStatus
		}
		}

go-apps/meep-virt-engine/helm/helm.go

+8 −8

Original line number	Diff line number	Diff line
		@@ -16,8 +16,8 @@

		package helm

		func GetReleasesName() ([]Release, error) {
		return getReleasesName()
		func GetReleasesName(sandboxName string) ([]Release, error) {
		return getReleasesName(sandboxName)
		}

		/*
		@@ -25,14 +25,14 @@ func GetReleasesName() ([]Release, error) {
		* https://github.com/helm/helm/issues/5952
		*/

		func GetReleases() ([]Release, error) {
		return getReleases()
		func GetReleases(sandboxName string) ([]Release, error) {
		return getReleases(sandboxName)
		}

		func InstallCharts(charts []Chart) error {
		return runTask(Install, charts)
		func InstallCharts(charts []Chart, sandboxName string) error {
		return runTask(Install, charts, sandboxName)
		}

		func DeleteReleases(charts []Chart) error {
		return runTask(Delete, charts)
		func DeleteReleases(charts []Chart, sandboxName string) error {
		return runTask(Delete, charts, sandboxName)
		}

go-apps/meep-virt-engine/helm/install.go

+7 −7

Original line number	Diff line number	Diff line
		@@ -24,8 +24,8 @@ import (
		log "github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-logger"
		)

		func installCharts(charts []Chart) error {
		err := ensureReleases(charts)
		func installCharts(charts []Chart, sandboxName string) error {
		err := ensureReleases(charts, sandboxName)
		if err != nil {
		return err
		}
		@@ -34,7 +34,7 @@ func installCharts(charts []Chart) error {
		err := install(chart)
		if err != nil {
		log.Info("Cleaning installed releases")
		cleanReleases(charts)
		cleanReleases(charts, sandboxName)
		return err
		}
		}
		@@ -42,9 +42,9 @@ func installCharts(charts []Chart) error {
		return nil
		}

		func ensureReleases(charts []Chart) error {
		func ensureReleases(charts []Chart, sandboxName string) error {
		// ensure that releases do not already exist
		releases, _ := GetReleasesName()
		releases, _ := GetReleasesName(sandboxName)
		for _, c := range charts {
		for _, r := range releases {
		if c.ReleaseName == r.Name {
		@@ -83,10 +83,10 @@ func install(chart Chart) error {
		return nil
		}

		func cleanReleases(charts []Chart) {
		func cleanReleases(charts []Chart, sandboxName string) {
		var toClean []Chart
		var cnt int
		releases, _ := GetReleasesName()
		releases, _ := GetReleasesName(sandboxName)

		for _, c := range charts {
		for _, r := range releases {

go-apps/meep-virt-engine/helm/list.go

+10 −10

Original line number	Diff line number	Diff line
		@@ -25,34 +25,34 @@ import (
		log "github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-logger"
		)

		func getReleasesName() ([]Release, error) {
		out, err := getList()
		func getReleasesName(sandboxName string) ([]Release, error) {
		out, err := getList(sandboxName)
		if err != nil {
		return nil, err
		}

		release, err := parseList(out, true)
		release, err := parseList(out, true, sandboxName)
		if err != nil {
		return nil, err
		}
		return release, nil
		}

		func getReleases() ([]Release, error) {
		out, err := getList()
		func getReleases(sandboxName string) ([]Release, error) {
		out, err := getList(sandboxName)
		if err != nil {
		return nil, err
		}

		release, err := parseList(out, false)
		release, err := parseList(out, false, sandboxName)
		if err != nil {
		return nil, err
		}
		return release, nil
		}

		func getList() ([]byte, error) {
		var cmd = exec.Command("helm", "ls", "-A")
		func getList(sandboxName string) ([]byte, error) {
		var cmd = exec.Command("helm", "ls", "-n", sandboxName)
		out, err := cmd.Output()
		if err != nil {
		err = errors.New("Unable to list Releases")
		@@ -62,7 +62,7 @@ func getList() ([]byte, error) {
		return out, nil
		}

		func parseList(buf []byte, nameOnly bool) ([]Release, error) {
		func parseList(buf []byte, nameOnly bool, sandboxName string) ([]Release, error) {
		/* Example of what needs to be parsed
		NAME REVISION UPDATED STATUS CHART NAMESPACE
		osvc1 1 Tue Jun 12 13:02:55 2018 DEPLOYED orientation-svc-0.1.0 default
		@@ -87,7 +87,7 @@ func parseList(buf []byte, nameOnly bool) ([]Release, error) {
		r.Name = scanWords.Text()
		if !nameOnly {
		// Status
		sp, err := GetReleaseStatus(r.Name)
		sp, err := GetReleaseStatus(r.Name, sandboxName)
		r.Status = *sp
		if err != nil {
		log.Error(err)

go-apps/meep-virt-engine/helm/status.go

+4 −4

Original line number	Diff line number	Diff line
		@@ -30,8 +30,8 @@ const STATUS string = "STATUS:"
		const RESOURCE string = "==>"

		// Returns the status of a release
		func GetReleaseStatus(name string) (*Status, error) {
		out, err := getStatus(name)
		func GetReleaseStatus(name string, sandboxName string) (*Status, error) {
		out, err := getStatus(name, sandboxName)
		if err != nil {
		return nil, err
		}
		@@ -43,8 +43,8 @@ func GetReleaseStatus(name string) (*Status, error) {
		return status, nil
		}

		func getStatus(name string) ([]byte, error) {
		var cmd = exec.Command("helm", "status", name)
		func getStatus(name string, sandboxName string) ([]byte, error) {
		var cmd = exec.Command("helm", "status", "-n", sandboxName, name)
		out, err := cmd.Output()
		if err != nil {
		err = errors.New("Error getting status for Release [" + name + "]")