Commit dbdcda7f authored by Kevin Di Lallo's avatar Kevin Di Lallo
Browse files

mon-engine fixes

parent 96c013a0

charts/meep-mon-engine/values.yaml

+2 −1
Original line number Diff line number Diff line
@@ -22,9 +22,10 @@ image: 
  tag: latest

  pullPolicy: Always

  env:

    # Provide comma-spearated list of expected pods to be monitored

    MEEP_DEPENDENCY_PODS: ""

    MEEP_CORE_PODS: ""

    MEEP_SANDBOX_PODS: "meep-loc-serv,meep-test"

    MEEP_SANDBOX_PODS: ""



service:

  type: ClusterIP

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

+3 −3
Original line number Diff line number Diff line
@@ -97,11 +97,11 @@ var expectedSboxPods map[string]*PodStatus 
func Init() (err error) {



	// Retrieve dependency pod list from environment variable

	expectedDepPods = make(map[string]*PodStatus)

	depPodsStr := strings.TrimSpace(os.Getenv("MEEP_DEPENDENCY_PODS"))

	log.Info("MEEP_DEPENDENCY_PODS: ", depPodsStr)

	if depPodsStr != "" {

		depPodsList = strings.Split(depPodsStr, ",")

		expectedDepPods = make(map[string]*PodStatus)

		for _, pod := range depPodsList {

			podStatus := new(PodStatus)

			podStatus.PodType = "core"
@@ -113,11 +113,11 @@ func Init() (err error) { 
	}



	// Retrieve core pod list from environment variable

	expectedCorePods = make(map[string]*PodStatus)

	corePodsStr := strings.TrimSpace(os.Getenv("MEEP_CORE_PODS"))

	log.Info("MEEP_CORE_PODS: ", corePodsStr)

	if corePodsStr != "" {

		corePodsList = strings.Split(corePodsStr, ",")

		expectedCorePods = make(map[string]*PodStatus)

		for _, pod := range corePodsList {

			podStatus := new(PodStatus)

			podStatus.PodType = "core"
@@ -129,11 +129,11 @@ func Init() (err error) { 
	}



	// Retrieve sandbox pod list from environment variable

	expectedSboxPods = make(map[string]*PodStatus)

	sboxPodsStr := strings.TrimSpace(os.Getenv("MEEP_SANDBOX_PODS"))

	log.Info("MEEP_SANDBOX_PODS: ", sboxPodsStr)

	if sboxPodsStr != "" {

		sboxPodsList = strings.Split(sboxPodsStr, ",")

		expectedSboxPods = make(map[string]*PodStatus)

	}



	// Create message queue

go-apps/meep-platform-ctrl/server/platform-ctrl.go

+4 −4
Original line number Diff line number Diff line
@@ -565,8 +565,8 @@ func createSandbox(sandboxName string, sandboxConfig *dataModel.SandboxConfig) ( 
		return err

	}



	// Inform Virt Engine to create sandbox

	msg := pfmCtrl.mqGlobal.CreateMsg(mq.MsgSandboxCreate, moduleVirtEngineName, moduleVirtEngineNamespace)

	// Send message to create sandbox

	msg := pfmCtrl.mqGlobal.CreateMsg(mq.MsgSandboxCreate, mq.TargetAll, mq.TargetAll)

	msg.Payload[fieldSandboxName] = sandboxName

	msg.Payload[fieldScenarioName] = sandboxConfig.ScenarioName

	log.Debug("TX MSG: ", mq.PrintMsg(msg))
@@ -584,8 +584,8 @@ func deleteSandbox(sandboxName string) { 
	// Remove sandbox from store

	pfmCtrl.sandboxStore.Del(sandboxName)



	// Inform Virt Engine to destroy sandbox

	msg := pfmCtrl.mqGlobal.CreateMsg(mq.MsgSandboxDestroy, moduleVirtEngineName, moduleVirtEngineNamespace)

	// Send message to destroy sandbox

	msg := pfmCtrl.mqGlobal.CreateMsg(mq.MsgSandboxDestroy, mq.TargetAll, mq.TargetAll)

	msg.Payload[fieldSandboxName] = sandboxName

	log.Debug("TX MSG: ", mq.PrintMsg(msg))

	err := pfmCtrl.mqGlobal.SendMsg(msg)