Commit 4ff40f4f authored by Kevin Di Lallo's avatar Kevin Di Lallo
Browse files

added app instance id for ue & cloud apps

parent 22ab789a

go-apps/meep-webhook/webhook.go

+1 −1
Original line number Original line Diff line number Diff line
@@ -142,7 +142,7 @@ func refreshSandboxData(sbxName string) error { 




	// Refresh app instance ID map

	// Refresh app instance ID map

	sbxData.AppIdMap = make(map[string]string)

	sbxData.AppIdMap = make(map[string]string)

	appTypeList := []string{mod.NodeTypeEdgeApp}

	appTypeList := []string{mod.NodeTypeUEApp, mod.NodeTypeEdgeApp, mod.NodeTypeCloudApp}

	appNameList := sbxData.ActiveScenario.GetNodeNames(appTypeList...)

	appNameList := sbxData.ActiveScenario.GetNodeNames(appTypeList...)

	for _, appName := range appNameList {

	for _, appName := range appNameList {

		appId := sbxData.ActiveScenario.GetNodeId(appName)

		appId := sbxData.ActiveScenario.GetNodeId(appName)

js-apps/meep-frontend/src/js/containers/meep-container.js

+3 −10
Original line number Original line Diff line number Diff line
@@ -58,8 +58,7 @@ import { 
  PAGE_HOME_INDEX,

  PAGE_HOME_INDEX,

  PAGE_CONFIGURE_INDEX,

  PAGE_CONFIGURE_INDEX,

  IDC_DIALOG_SIGN_IN,

  IDC_DIALOG_SIGN_IN,

  IDC_DIALOG_SESSION_TERMINATED,

  IDC_DIALOG_SESSION_TERMINATED

  ELEMENT_TYPE_EDGE_APP

} from '../meep-constants';

} from '../meep-constants';





import {

import {
@@ -113,8 +112,6 @@ import { 




import {

import {

  FIELD_CONNECTIVITY_MODEL,

  FIELD_CONNECTIVITY_MODEL,

  FIELD_TYPE,

  FIELD_IMAGE,

  getElemByName,

  getElemByName,

  getElemFieldVal

  getElemFieldVal

} from '../util/elem-utils';

} from '../util/elem-utils';
@@ -339,16 +336,12 @@ class MeepContainer extends Component { 
      .then(res => {

      .then(res => {

        var scenarioPodsPhases = res.data.podStatus;

        var scenarioPodsPhases = res.data.podStatus;





        // Add app instance ID for Edge Apps

        // Add node ID

        if (this.props.exec && this.props.exec.table && this.props.exec.table.entries) {

        if (this.props.exec && this.props.exec.table && this.props.exec.table.entries) {

          for (var i in scenarioPodsPhases) {

          for (var i in scenarioPodsPhases) {

            var scenarioPod = scenarioPodsPhases[i];

            var scenarioPod = scenarioPodsPhases[i];

            var elem = getElemByName(this.props.exec.table.entries, scenarioPod.name);

            var elem = getElemByName(this.props.exec.table.entries, scenarioPod.name);

            let elemType = getElemFieldVal(elem, FIELD_TYPE);

            scenarioPodsPhases[i].id = elem ? elem.id : '';

            let elemImage = getElemFieldVal(elem, FIELD_IMAGE);

            if (elem && elemType === ELEMENT_TYPE_EDGE_APP && !elemImage.endsWith('meep-app-enablement')) {

              scenarioPodsPhases[i].id = elem.id;

            }

          }

          }

        }

        }

        this.props.changeScenarioPodsPhases(scenarioPodsPhases);

        this.props.changeScenarioPodsPhases(scenarioPodsPhases);