Commit def4c87f authored by Yann Garcia's avatar Yann Garcia
Browse files

Merge branch 'STF678_Task1_2' into 'Task2_PoC' 

# Conflicts:
#   go-apps/meepctl/cmd/deploy.go
#   tools/HOWTO
#   tools/generate_stub.sh
parents 964abe33 e6e86074

AdvantEDGE.code-workspace

0 → 100644
+24 −0
Original line number Diff line number Diff line 
{

    "folders": [

		{

			"path": "."

		},

		{

			"path": "../mec-sandbox"

		},

		{

			"path": "../mec-sandbox-scenarios"

		},

		{

			"path": "../tmp/nodejs"

		},

		{

			"path": "../tmp/tools"

		}

	],

	"extensions": {

		"recommendations": [

			"waderyan.nodejs-extension-pack"

		]

	}

}
 
 No newline at end of file

charts/meep-app-enablement/values-template.yaml

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ image: 
  env:

    MEEP_INSTANCE_ID: {{.InstanceId}}

    MEEP_SANDBOX_NAME: {{.SandboxName}}

    MEEP_SVC_PATH: /mec_app_support/v1

    MEEP_SVC_PATH: /mec_app_support/v2

    MEEP_HOST_URL: {{.HostUrl}}

    {{- if .IsMepService }}

    MEEP_MEP_NAME: {{.MepName}}

charts/meep-loc-serv/values-template.yaml

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ image: 
  env:

    MEEP_INSTANCE_ID: {{.InstanceId}}

    MEEP_SANDBOX_NAME: {{.SandboxName}}

    MEEP_SVC_PATH: /location/v2

    MEEP_SVC_PATH: /location/v3

    MEEP_HOST_URL: {{.HostUrl}}

    {{- if .IsMepService }}

    MEEP_MEP_NAME: {{.MepName}}

config/permissions-open.yaml

+2 −2
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ default: 
#   #------------------------------

#   - name: 'meep-app-enablement'

#     api: 'mec_app_support'

#     path: '/mec_app_support/v1'

#     path: '/mec_app_support/v2'

#     sbox: true

#     default:

#       mode: 'allow'
@@ -276,7 +276,7 @@ default: 
#   #  Location Service (Sbox)

#   #------------------------------

#   - name: 'meep-loc-serv'

#     path: '/location/v2'

#     path: '/location/v3'

#     sbox: true

#     default:

#       mode: 'allow'

config/permissions-secure.yaml

+2 −2
Original line number Diff line number Diff line
@@ -157,7 +157,7 @@ services: 
  #------------------------------

  - name: 'meep-app-enablement'

    api: 'mec_app_support'

    path: '/mec_app_support/v1'

    path: '/mec_app_support/v2'

    sbox: true

    default:

      mode: 'verify'
@@ -191,7 +191,7 @@ services: 
  #  Location Service (Sbox)

  #------------------------------

  - name: 'meep-loc-serv'

    path: '/location/v2'

    path: '/location/v3'

    sbox: true

    default:

      mode: 'verify'