Commit 2a8f8081 authored by Nikhil Doifode's avatar Nikhil Doifode
Browse files

Review comments resolved

parent 728510e4

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

+10 −8
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

		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

	}

}
@@ -632,7 +634,7 @@ func removeExpectedPods(sandboxName string) { 
		// Get sandbox-specific pod name

		var podName string

		prefix := "meep-"

		sandboxPrefix := prefix

		sandboxPrefix := prefix + sandboxName + "-"

		if strings.HasPrefix(pod, prefix) {

			podName = sandboxPrefix + pod[len(prefix):]

		} else {

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

+4 −4
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ func getReleasesName(sandboxName string) ([]Release, error) { 
		return nil, err

	}



	release, err := parseList(out, true)

	release, err := parseList(out, true, sandboxName)

	if err != nil {

		return nil, err

	}
@@ -44,7 +44,7 @@ func getReleases(sandboxName string) ([]Release, error) { 
		return nil, err

	}



	release, err := parseList(out, false)

	release, err := parseList(out, false, sandboxName)

	if err != nil {

		return nil, err

	}
@@ -62,7 +62,7 @@ func getList(sandboxName string) ([]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 + "]")

go-apps/meep-virt-engine/server/chart-template.go

+3 −6
Original line number Diff line number Diff line
@@ -429,14 +429,11 @@ func createChart(chartName string, sandboxName string, scenarioName string, temp 
func newChart(chartName string, sandboxName string, scenarioName string, chartLocation string, valuesFile string) helm.Chart {

	var chart helm.Chart



	// Create release name by adding sandbox + scenario prefix

	prefix := "meep-"

	sandboxPrefix := prefix

	// Create release name by adding scenario prefix

	if scenarioName == "" {

		prefix := "meep-"

		chart.ReleaseName = sandboxPrefix + chartName[len(prefix):]

		chart.ReleaseName = chartName

	} else {

		chart.ReleaseName = sandboxPrefix + scenarioName + "-" + chartName

		chart.ReleaseName = "meep-" + scenarioName + "-" + chartName

	}



	chart.Name = chartName

go-apps/meep-webhook/webhook.go

+2 −2
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ func loadConfig(configFile string) (*Config, error) { 
}



// Determine if resource is part of the active scenario

func isScenarioResource(name string, sandboxName string, scenarioName string) bool {

func isScenarioResource(name string, scenarioName string) bool {

	return name != "" && strings.HasPrefix(name, "meep-"+scenarioName+"-")

}
@@ -278,7 +278,7 @@ func (whsvr *WebhookServer) mutate(ar *v1beta1.AdmissionReview) *v1beta1.Admissi 
	}



	// Determine if resource is part of the active scenario

	if !isScenarioResource(releaseName, req.Namespace, activeScenarioNames[req.Namespace]) {

	if !isScenarioResource(releaseName, activeScenarioNames[req.Namespace]) {

		log.Info("Resource not part of active scenario. Ignoring request...")

		return &v1beta1.AdmissionResponse{

			Allowed: true,