Commit 8a7b9f85 authored by Kevin Di Lallo's avatar Kevin Di Lallo
Browse files

removed state from mec applications API call to sandbox-controller

parent b77f4e1e

go-apps/meep-ams/server/ams.go

+11 −10
Original line number Diff line number Diff line
@@ -509,16 +509,17 @@ func stopRegistrationTicker() { 
}



func getAppInstanceId() (id string, err error) {

	var app scc.ApplicationInfo

	app.Id = instanceId

	app.Name = serviceCategory

	app.MepName = mepName

	app.Version = serviceAppVersion

	appType := scc.SYSTEM_ApplicationType

	app.Type_ = &appType

	state := scc.INITIALIZED_ApplicationState

	app.State = &state

	response, _, err := sbxCtrlClient.ApplicationsApi.ApplicationsPOST(context.TODO(), app)

	var appInfo scc.ApplicationInfo

	appInfo.Id = instanceId

	appInfo.Name = serviceCategory

	appInfo.Type_ = "SYSTEM"

	appInfo.MepName = mepName

	if mepName == defaultMepName {

		appInfo.Persist = true

	} else {

		appInfo.Persist = false

	}

	response, _, err := sbxCtrlClient.ApplicationsApi.ApplicationsPOST(context.TODO(), appInfo)

	if err != nil {

		log.Error("Failed to get App Instance ID with error: ", err)

		return "", err

go-apps/meep-loc-serv/server/loc-serv.go

+6 −5
Original line number Diff line number Diff line
@@ -468,11 +468,12 @@ func getAppInstanceId() (id string, err error) { 
	appInfo.Id = instanceId

	appInfo.Name = serviceCategory

	appInfo.MepName = mepName

	appInfo.Version = serviceAppVersion

	appType := scc.SYSTEM_ApplicationType

	appInfo.Type_ = &appType

	state := scc.INITIALIZED_ApplicationState

	appInfo.State = &state

	appInfo.Type_ = "SYSTEM"

	if mepName == defaultMepName {

		appInfo.Persist = true

	} else {

		appInfo.Persist = false

	}

	response, _, err := sbxCtrlClient.ApplicationsApi.ApplicationsPOST(context.TODO(), appInfo)

	if err != nil {

		log.Error("Failed to get App Instance ID with error: ", err)

go-apps/meep-rnis/server/rnis.go

+7 −6
Original line number Diff line number Diff line
@@ -543,13 +543,14 @@ func stopRegistrationTicker() { 
func getAppInstanceId() (id string, err error) {

	var appInfo scc.ApplicationInfo

	appInfo.Id = instanceId

	appInfo.Name = serviceCategory //instanceName

	appInfo.Name = serviceCategory

	appInfo.Type_ = "SYSTEM"

	appInfo.MepName = mepName

	appInfo.Version = serviceAppVersion

	appType := scc.SYSTEM_ApplicationType

	appInfo.Type_ = &appType

	state := scc.INITIALIZED_ApplicationState

	appInfo.State = &state

	if mepName == defaultMepName {

		appInfo.Persist = true

	} else {

		appInfo.Persist = false

	}

	response, _, err := sbxCtrlClient.ApplicationsApi.ApplicationsPOST(context.TODO(), appInfo)

	if err != nil {

		log.Error("Failed to get App Instance ID with error: ", err)

go-apps/meep-sandbox-ctrl/server/app-ctrl.go

+5 −6
Original line number Diff line number Diff line
@@ -340,9 +340,6 @@ func validateAppInfo(appInfo *dataModel.ApplicationInfo, appInstanceId string) e 
	if appInfo.MepName == "" {

		return errors.New("Mandatory MEP Name not present")

	}

	if appInfo.State == nil {

		return errors.New("Mandatory State not present")

	}



	// Set default App type if missing

	if appInfo.Type_ == "" {
@@ -374,6 +371,8 @@ func convertApplicationInfoToApp(appInfo *dataModel.ApplicationInfo) *apps.Appli 
		Id:      appInfo.Id,

		Name:    appInfo.Name,

		Mep:     appInfo.MepName,

		Type:    appInfo.Type_,

		Persist: appInfo.Persist,

	}

	return app

}

go-apps/meep-wais/server/wais.go

+7 −6
Original line number Diff line number Diff line
@@ -387,13 +387,14 @@ func stopRegistrationTicker() { 
func getAppInstanceId() (id string, err error) {

	var appInfo scc.ApplicationInfo

	appInfo.Id = instanceId

	appInfo.Name = serviceCategory //instanceName

	appInfo.Name = serviceCategory

	appInfo.Type_ = "SYSTEM"

	appInfo.MepName = mepName

	appInfo.Version = serviceAppVersion

	appType := scc.SYSTEM_ApplicationType

	appInfo.Type_ = &appType

	state := scc.INITIALIZED_ApplicationState

	appInfo.State = &state

	if mepName == defaultMepName {

		appInfo.Persist = true

	} else {

		appInfo.Persist = false

	}

	response, _, err := sbxCtrlClient.ApplicationsApi.ApplicationsPOST(context.TODO(), appInfo)

	if err != nil {

		log.Error("Failed to get App Instance ID with error: ", err)