Commit 671d1022 authored by Ikram ul Haq's avatar Ikram ul Haq
Browse files

Merge branch 'STF678_Task1_2_3_4' into STF678_Task1_2_3_MEC015 

merging with branch with STF678_Task1_2_3_4
parents 6f1a240f 19fda459

.gitmodules

0 → 100644
+4 −0
Original line number Diff line number Diff line 
[submodule "etsi-mec-sandbox-frontend"]

	path = etsi-mec-sandbox-frontend

	url = https://labs.etsi.org/rep/mec/etsi-mec-sandbox-frontend.git

	branch = STF678_Task4

AUTHORS

+5 −0
Original line number Diff line number Diff line
@@ -12,3 +12,8 @@ InterDigital Communications Inc 
InterDigital Communications Inc

xFlow Research (Pvt.) Inc.

FSCOM



[v1.10.0]

InterDigital Communications Inc

xFlow Research (Pvt.) Inc.

FSCOM

README.md

+17 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 


:zap: **New! Runtime [Sequence](https://interdigitalinc.github.io/AdvantEDGE/docs/usage/gui/exec-view/#sequence-diagram) and [Data Flow](https://interdigitalinc.github.io/AdvantEDGE/docs/usage/gui/exec-view/#data-flow-diagram) diagrams :chart_with_upwards_trend:**



:zap: **Service API upgrade to version 2.2.1 for [ETSI MEC011](https://interdigitalinc.github.io/AdvantEDGE/docs/overview/edge-services/#edge-platform-application-enablement-service), [ETSI MEC012](https://interdigitalinc.github.io/AdvantEDGE/docs/overview/edge-services/#radio-network-information-service), [ETSI MEC013](https://interdigitalinc.github.io/AdvantEDGE/docs/overview/edge-services/#location-service) and [ETSI MEC021](https://interdigitalinc.github.io/AdvantEDGE/docs/overview/edge-services/#application-mobility-service) :arrow_up:**

:zap: **Service API upgrade to version 3.2.1 for [ETSI MEC011](https://interdigitalinc.github.io/AdvantEDGE/docs/overview/edge-services/#edge-platform-application-enablement-service), [ETSI MEC012](https://interdigitalinc.github.io/AdvantEDGE/docs/overview/edge-services/#radio-network-information-service), [ETSI MEC013](https://interdigitalinc.github.io/AdvantEDGE/docs/overview/edge-services/#location-service), [ETSI MEC021](https://interdigitalinc.github.io/AdvantEDGE/docs/overview/edge-services/#application-mobility-service), [ETSI MEC030](https://interdigitalinc.github.io/AdvantEDGE/docs/overview/edge-services/#v2x-information-service) :arrow_up:**



:zap: **[Runtime Setup](https://interdigitalinc.github.io/AdvantEDGE/docs/setup/env-runtime/) updates to support k8s versions up to 1.26 :arrow_up:**
@@ -20,6 +20,22 @@ 


------



**_What's New in v1.10.0!_**



:zap: **New edge native service: [ETSI MEC Profile for CAPIF](https://interdigitalinc.github.io/AdvantEDGE/docs/overview/edge-services/#edge-platform-application-enablement-service)**



:zap: **New edge native service: [ETSI MEC040 - MEC Federation API](https://interdigitalinc.github.io/AdvantEDGE/docs/overview/edge-services/#mec-federation-service)**



:zap: **Service API upgrade to MEC Phase 3 for [ETSI MEC011](https://interdigitalinc.github.io/AdvantEDGE/docs/overview/edge-services/#edge-platform-application-enablement-service), [ETSI MEC012](https://interdigitalinc.github.io/AdvantEDGE/docs/overview/edge-services/#radio-network-information-service), [ETSI MEC013](https://interdigitalinc.github.io/AdvantEDGE/docs/overview/edge-services/#location-service), [ETSI MEC021](https://interdigitalinc.github.io/AdvantEDGE/docs/overview/edge-services/#application-mobility-service), [ETSI MEC030](https://interdigitalinc.github.io/AdvantEDGE/docs/overview/edge-services/#v2x-information-service), [ETSI MEC033](https://interdigitalinc.github.io/AdvantEDGE/docs/overview/edge-services/#iot-api), [ETSI MEC040](https://interdigitalinc.github.io/AdvantEDGE/docs/overview/edge-services/#mec-federation-service) and [ETSI MEC046](https://interdigitalinc.github.io/AdvantEDGE/docs/overview/edge-services/#mec-sensors-sharing) :arrow_up:**



:zap: **New command line api to develop MEC application/service without GUI**



:zap: **General maintenance :hammer_and_wrench:**



:zap: **Don't hesitate to reach out to us by initiating a [GitHub Discussion](https://github.com/InterDigitalInc/AdvantEDGE/discussions) :octocat:**



------



## What is AdvantEDGE?



AdvantEDGE is a Mobile Edge Emulation Platform (MEEP) that runs on Docker & Kubernetes.

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

+25 −0
Original line number Diff line number Diff line
@@ -46,9 +46,22 @@ ingress: 
        {{- if .IsMepService }}

        - /{{.SandboxName}}/{{.MepName}}/mec_app_support

        - /{{.SandboxName}}/{{.MepName}}/mec_service_mgmt

        - /{{.SandboxName}}/{{.MepName}}/service-apis

        - /{{.SandboxName}}/{{.MepName}}/published-apis

        - /{{.SandboxName}}/{{.MepName}}/capif-events

        - /{{.SandboxName}}/{{.MepName}}/eecs-serviceprovisioning

        - /{{.SandboxName}}/{{.MepName}}/eees-eecregistration

        - /{{.SandboxName}}/{{.MepName}}/eees-easdiscovery

        

        {{- else }}

        - /{{.SandboxName}}/mec_app_support

        - /{{.SandboxName}}/mec_service_mgmt

        - /{{.SandboxName}}/service-apis

        - /{{.SandboxName}}/published-apis

        - /{{.SandboxName}}/capif-events

        - /{{.SandboxName}}/eecs-serviceprovisioning

        - /{{.SandboxName}}/eees-eecregistration

        - /{{.SandboxName}}/eees-easdiscovery

        {{- end }}

  annotations:

    kubernetes.io/ingress.class: nginx
@@ -57,10 +70,22 @@ ingress: 
    nginx.ingress.kubernetes.io/configuration-snippet: |

      rewrite ^/{{ .SandboxName }}/{{.MepName}}/mec_app_support(/|$)(.*)$ /mec_app_support/$2 break;

      rewrite ^/{{ .SandboxName }}/{{.MepName}}/mec_service_mgmt(/|$)(.*)$ /mec_service_mgmt/$2 break;

      rewrite ^/{{ .SandboxName }}/{{.MepName}}/service-apis(/|$)(.*)$ /service-apis/$2 break;

      rewrite ^/{{ .SandboxName }}/{{.MepName}}/published-apis(/|$)(.*)$ /published-apis/$2 break;

      rewrite ^/{{ .SandboxName }}/{{.MepName}}/capif-events(/|$)(.*)$ /capif-events/$2 break;

      rewrite ^/{{ .SandboxName }}/{{.MepName}}/eecs-serviceprovisioning(/|$)(.*)$ /eecs-serviceprovisioning/$2 break;

      rewrite ^/{{ .SandboxName }}/{{.MepName}}/eees-eecregistration(/|$)(.*)$ /eees-eecregistration/$2 break;

      rewrite ^/{{ .SandboxName }}/{{.MepName}}/eees-easdiscovery(/|$)(.*)$ /eees-easdiscovery/$2 break;

    {{- else }}

    nginx.ingress.kubernetes.io/configuration-snippet: |

      rewrite ^/{{ .SandboxName }}/mec_app_support(/|$)(.*)$ /mec_app_support/$2 break;

      rewrite ^/{{ .SandboxName }}/mec_service_mgmt(/|$)(.*)$ /mec_service_mgmt/$2 break;

      rewrite ^/{{ .SandboxName }}/service-apis(/|$)(.*)$ /service-apis/$2 break;

      rewrite ^/{{ .SandboxName }}/published-apis(/|$)(.*)$ /published-apis/$2 break;

      rewrite ^/{{ .SandboxName }}/capif-events(/|$)(.*)$ /capif-events/$2 break;

      rewrite ^/{{ .SandboxName }}/eecs-serviceprovisioning(/|$)(.*)$ /eecs-serviceprovisioning/$2 break;

      rewrite ^/{{ .SandboxName }}/eees-eecregistration(/|$)(.*)$ /eees-eecregistration/$2 break;

      rewrite ^/{{ .SandboxName }}/eees-easdiscovery(/|$)(.*)$ /eees-easdiscovery/$2 break;

    {{- end }}

    {{- if .AuthEnabled }}

    nginx.ingress.kubernetes.io/auth-url: https://$http_host/auth/v1/authenticate?svc=meep-app-enablement&sbox={{.SandboxName}}&mep={{.MepName}}

charts/meep-dai/templates/deployment.yaml

+5 −5
Original line number Diff line number Diff line
@@ -23,9 +23,11 @@ spec: 
    spec:

      serviceAccountName: {{ .Values.serviceAccount }}

      volumes:

      {{- if .Values.onboardedapp.enabled}}

        - name: onboardedapp-storage

          persistentVolumeClaim:

            claimName: meep-dai-onboardedapp-pvc

      {{- end}}

      {{- if .Values.codecov.enabled}}

        - name: codecov-storage

          persistentVolumeClaim:
@@ -34,10 +36,6 @@ spec: 
      containers:

        - name: {{ .Chart.Name }}

          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"

          {{- if .Values.codecov.enabled}}

          command: [ "/meep-dai" ]

          args: [ "-test.coverprofile=/codecov/codecov-meep-dai.out", "__DEVEL--code-cov" ]

          {{- end}}

          imagePullPolicy: {{ .Values.image.pullPolicy }}

          ports:

            - containerPort: {{ .Values.deployment.port }}
@@ -58,8 +56,10 @@ spec: 
              value: {{ $value | quote }}

            {{- end }}

          volumeMounts:

          {{- if .Values.onboardedapp.enabled}}

          - name: onboardedapp-storage

            mountPath: /onboardedapp-vol

          {{- end}}

          {{- if .Values.codecov.enabled}}

          - name: codecov-storage

            mountPath: /codecov