Commit c3893cae authored by Muhammad Umair Khan's avatar Muhammad Umair Khan
Browse files

Refactor: Global rename of MEP to Location and UI directory rename 

This commit includes several major platform-wide changes to improve semantic consistency and deployment logic:

- Refactored MEEP_MEP_NAME to MEEP_LOCATION_NAME across all Helm charts, shell entrypoint scripts, and Go source code to better reflect the deployment topology.

- Renamed internal Go struct fields and variables from MepName to LocationName in meep-virt-engine and related models.

- Completely renamed the meep-frontend UI directory and all its internal references to meep-admin-console to better reflect its administrative purpose.

- Restored and fixed the tiered topological sort deployment logic in meep-virt-engine. Modified the newChart factory to properly extract Dependencies and ProcName from the process models, allowing dependent applications (e.g. IoT services) to wait for core services before starting.

- Re-vendored various Go modules to ensure a clean build state and updated package-lock.json files for Node clients.
parent 6c78a3f8

charts/mec-services/meep-ams/values-template.yaml

+6 −6
Original line number Diff line number Diff line
@@ -23,10 +23,10 @@ image: 
    MEEP_SVC_PATH: /amsi/v1

    MEEP_HOST_URL: {{.HostUrl}}

    {{- if .IsMepService }}

    MEEP_MEP_NAME: {{.MepName}}

    MEEP_LOCATION_NAME: {{.LocationName}}

    {{- end }}

    {{- if eq .AppEnablement "local" }}

    MEEP_APP_ENABLEMENT: {{.MepName}}-meep-app-enablement

    MEEP_APP_ENABLEMENT: {{.LocationName}}-meep-app-enablement

    {{- else if eq .AppEnablement "global" }}

    MEEP_APP_ENABLEMENT: meep-app-enablement

    {{- end }}
@@ -36,7 +36,7 @@ image: 


service:

  {{- if .IsMepService }}

  name: {{.MepName}}-meep-ams

  name: {{.LocationName}}-meep-ams

  {{- else }}

  name: meep-ams

  {{- end }}
@@ -49,7 +49,7 @@ ingress: 
    - name: ''

      paths:

        {{- if .IsMepService }}

        - /{{.SandboxName}}/{{.MepName}}/amsi

        - /{{.SandboxName}}/{{.LocationName}}/amsi

        {{- else }}

        - /{{.SandboxName}}/amsi

        {{- end }}
@@ -58,13 +58,13 @@ ingress: 
    nginx.ingress.kubernetes.io/force-ssl-redirect: {{ .HttpsOnly }}

    {{- if .IsMepService }}

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

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

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

    {{- else }}

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

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

    {{- end }}

    {{- if .AuthEnabled }}

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

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

    {{- end }}

  labels: {}

  tls:

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

+19 −19
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ image: 
    MEEP_SVC_PATH: /mec_app_support/v2

    MEEP_HOST_URL: {{.HostUrl}}

    {{- if .IsMepService }}

    MEEP_MEP_NAME: {{.MepName}}

    MEEP_LOCATION_NAME: {{.LocationName}}

    {{- end }}

    {{- range .Env}}

    {{.}}
@@ -31,7 +31,7 @@ image: 


service:

  {{- if .IsMepService }}

  name: {{.MepName}}-meep-app-enablement

  name: {{.LocationName}}-meep-app-enablement

  {{- else }}

  name: meep-app-enablement

  {{- end }}
@@ -44,14 +44,14 @@ ingress: 
    - name: ''

      paths:

        {{- 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

        - /{{.SandboxName}}/{{.LocationName}}/mec_app_support

        - /{{.SandboxName}}/{{.LocationName}}/mec_service_mgmt

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

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

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

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

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

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

        

        {{- else }}

        - /{{.SandboxName}}/mec_app_support
@@ -68,14 +68,14 @@ ingress: 
    nginx.ingress.kubernetes.io/force-ssl-redirect: {{ .HttpsOnly }}

    {{- if .IsMepService }}

    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;

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

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

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

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

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

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

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

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

    {{- else }}

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

      rewrite ^/{{ .SandboxName }}/mec_app_support(/|$)(.*)$ /mec_app_support/$2 break;
@@ -88,7 +88,7 @@ ingress: 
      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}}

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

    {{- end }}

  labels: {}

  tls:

charts/mec-services/meep-dai/values-template.yaml

+16 −16
Original line number Diff line number Diff line
@@ -23,10 +23,10 @@ image: 
    MEEP_SVC_PATH: /dev_app/v1

    MEEP_HOST_URL: {{.HostUrl}}

    {{- if .IsMepService }}

    MEEP_MEP_NAME: {{.MepName}}

    MEEP_LOCATION_NAME: {{.LocationName}}

    {{- end }}

    {{- if eq .AppEnablement "local" }}

    MEEP_APP_ENABLEMENT: {{.MepName}}-meep-app-enablement

    MEEP_APP_ENABLEMENT: {{.LocationName}}-meep-app-enablement

    {{- else if eq .AppEnablement "global" }}

    MEEP_APP_ENABLEMENT: meep-app-enablement

    {{- end }}
@@ -36,7 +36,7 @@ image: 


service:

  {{- if .IsMepService }}

  name: {{.MepName}}-meep-dai

  name: {{.LocationName}}-meep-dai

  {{- else }}

  name: meep-dai

  {{- end }}
@@ -49,17 +49,17 @@ ingress: 
    - name: ''

      paths:

        {{- if .IsMepService }}

        - path: /{{.SandboxName}}/{{.MepName}}/dev_app

        - path: /{{.SandboxName}}/{{.LocationName}}/dev_app

          port: 80

        - path: /{{.SandboxName}}/{{.MepName}}/onboarded-demo0

        - path: /{{.SandboxName}}/{{.LocationName}}/onboarded-demo0

          port: 31120

        - path: /{{.SandboxName}}/{{.MepName}}/onboarded-demo1

        - path: /{{.SandboxName}}/{{.LocationName}}/onboarded-demo1

          port: 31121

        - path: /{{.SandboxName}}/{{.MepName}}/onboarded-demo2

        - path: /{{.SandboxName}}/{{.LocationName}}/onboarded-demo2

          port: 31122

        - path: /{{.SandboxName}}/{{.MepName}}/onboarded-demo3

        - path: /{{.SandboxName}}/{{.LocationName}}/onboarded-demo3

          port: 31123

        - path: /{{.SandboxName}}/{{.MepName}}/onboarded-demo4

        - path: /{{.SandboxName}}/{{.LocationName}}/onboarded-demo4

          port: 31124

        {{- else }}

        - path: /{{.SandboxName}}/dev_app
@@ -82,12 +82,12 @@ ingress: 
    nginx.ingress.kubernetes.io/force-ssl-redirect: {{ .HttpsOnly }}

    {{- if .IsMepService }}

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

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

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

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

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

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

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

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

      rewrite ^/{{.SandboxName}}/{{.LocationName}}/onboarded-demo0(/|$)(.*)$ /$2 break;

      rewrite ^/{{.SandboxName}}/{{.LocationName}}/onboarded-demo1(/|$)(.*)$ /$2 break;

      rewrite ^/{{.SandboxName}}/{{.LocationName}}/onboarded-demo2(/|$)(.*)$ /$2 break;

      rewrite ^/{{.SandboxName}}/{{.LocationName}}/onboarded-demo3(/|$)(.*)$ /$2 break;

      rewrite ^/{{.SandboxName}}/{{.LocationName}}/onboarded-demo4(/|$)(.*)$ /$2 break;

    {{- else }}

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

      rewrite ^/{{.SandboxName}}/dev_app(/|$)(.*)$ /dev_app/$2 break;
@@ -98,7 +98,7 @@ ingress: 
      rewrite ^/{{.SandboxName}}/onboarded-demo4(/|$)(.*)$ /$2 break;

    {{- end }}

    {{- if .AuthEnabled }}

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

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

    {{- end }}

  labels: {}

  tls:

charts/mec-services/meep-federation/values-template.yaml

+6 −6
Original line number Diff line number Diff line
@@ -27,10 +27,10 @@ image: 
    MEEP_BROKER: mqtt://meep-cloud-mosquitto:9001

    MEEP_TOPIC: ETSI/MEC/Federation

    {{- if .IsMepService }}

    MEEP_MEP_NAME: {{.MepName}}

    MEEP_LOCATION_NAME: {{.LocationName}}

    {{- end }}

    {{- if eq .AppEnablement "local" }}

    MEEP_APP_ENABLEMENT: {{.MepName}}-meep-app-enablement

    MEEP_APP_ENABLEMENT: {{.LocationName}}-meep-app-enablement

    {{- else if eq .AppEnablement "global" }}

    MEEP_APP_ENABLEMENT: meep-app-enablement

    {{- end }}
@@ -40,7 +40,7 @@ image: 


service:

  {{- if .IsMepService }}

  name: {{.MepName}}-meep-federation

  name: {{.LocationName}}-meep-federation

  {{- else }}

  name: meep-federation

  {{- end }}
@@ -53,7 +53,7 @@ ingress: 
    - name: ''

      paths:

        {{- if .IsMepService }}

        - /{{.SandboxName}}/{{.MepName}}/fed_enablement

        - /{{.SandboxName}}/{{.LocationName}}/fed_enablement

        {{- else }}

        - /{{.SandboxName}}/fed_enablement

        {{- end }}
@@ -62,13 +62,13 @@ ingress: 
    nginx.ingress.kubernetes.io/force-ssl-redirect: {{ .HttpsOnly }}

    {{- if .IsMepService }}

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

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

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

    {{- else }}

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

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

    {{- end }}

    {{- if .AuthEnabled }}

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

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

    {{- end }}

  labels: {}

  tls:

charts/mec-services/meep-iot/values-template.yaml

+6 −6
Original line number Diff line number Diff line
@@ -23,10 +23,10 @@ image: 
    MEEP_SVC_PATH: /iots/v1

    MEEP_HOST_URL: {{.HostUrl}}

    {{- if .IsMepService }}

    MEEP_MEP_NAME: {{.MepName}}

    MEEP_LOCATION_NAME: {{.LocationName}}

    {{- end }}

    {{- if eq .AppEnablement "local" }}

    MEEP_APP_ENABLEMENT: {{.MepName}}-meep-app-enablement

    MEEP_APP_ENABLEMENT: {{.LocationName}}-meep-app-enablement

    {{- else if eq .AppEnablement "global" }}

    MEEP_APP_ENABLEMENT: meep-app-enablement

    {{- end }}
@@ -36,7 +36,7 @@ image: 


service:

  {{- if .IsMepService }}

  name: {{.MepName}}-meep-iot

  name: {{.LocationName}}-meep-iot

  {{- else }}

  name: meep-iot

  {{- end }}
@@ -49,7 +49,7 @@ ingress: 
    - name: ''

      paths:

        {{- if .IsMepService }}

        - /{{.SandboxName}}/{{.MepName}}/iots

        - /{{.SandboxName}}/{{.LocationName}}/iots

        {{- else }}

        - /{{.SandboxName}}/iots

        {{- end }}
@@ -58,13 +58,13 @@ ingress: 
    nginx.ingress.kubernetes.io/force-ssl-redirect: {{ .HttpsOnly }}

    {{- if .IsMepService }}

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

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

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

    {{- else }}

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

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

    {{- end }}

    {{- if .AuthEnabled }}

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

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

    {{- end }}

  labels: {}

  tls: