Commit 87a8645c authored by M. Rehan Abbasi's avatar M. Rehan Abbasi
Browse files

add MEC015 service with permissions

parent 74e9f832
Loading
Loading
Loading
Loading
+46 −46
Original line number Diff line number Diff line
@@ -733,15 +733,15 @@ repo:
        codecov: false
        # supports linting
        lint: true
      meep-tm:
      meep-wais:
        # location of source code
        src: go-apps/meep-tm
        src: go-apps/meep-wais
        # location of binary
        bin: bin/meep-tm
        bin: bin/meep-wais
        # location of deployment chart
        chart: charts/meep-tm
        chart: charts/meep-wais
        # user supplied value file located @ .meep/user/values (use below file name)
        chart-user-values: meep-tm.yaml
        chart-user-values: meep-wais.yaml
        # extra build flags
        build-flags:
          - -mod=vendor
@@ -757,29 +757,25 @@ repo:
        lint: true
        # location of API specifications
        api:
          - name: 'AdvantEDGE MEC Bandwidth Management REST API'
            file: go-apps/meep-tm/api/bwm/swagger.yaml
          - name: 'AdvantEDGE MEC Multi-access Traffic Steering REST API'
            file: go-apps/meep-tm/api/mts/swagger.yaml
          - name: 'AdvantEDGE WLAN Access Information REST API'
            file: go-apps/meep-wais/api/swagger.yaml
        # location of user supplied API specifications
        user-api:
          - name: 'Bandwidth Management API'
            file: config/api/bwm-api.yaml
          - name: 'Multi-access Traffic Steering API'
            file: config/api/mts-api.yaml
          - name: 'WLAN Access Information Service REST API'
            file: config/api/wais-api.yaml
        # resources available to docker container image
        docker-data:
          # location of entry script
          'entrypoint.sh': go-apps/meep-tm/entrypoint.sh
      meep-wais:
          'entrypoint.sh': go-apps/meep-wais/entrypoint.sh
      meep-vis:
        # location of source code
        src: go-apps/meep-wais
        src: go-apps/meep-vis
        # location of binary
        bin: bin/meep-wais
        bin: bin/meep-vis
        # location of deployment chart
        chart: charts/meep-wais
        chart: charts/meep-vis
        # user supplied value file located @ .meep/user/values (use below file name)
        chart-user-values: meep-wais.yaml
        chart-user-values: meep-vis.yaml
        # extra build flags
        build-flags:
          - -mod=vendor
@@ -795,25 +791,27 @@ repo:
        lint: true
        # location of API specifications
        api:
          - name: 'AdvantEDGE WLAN Access Information REST API'
            file: go-apps/meep-wais/api/swagger.yaml
          - name: 'AdvantEDGE V2X Information REST API'
            file: go-apps/meep-vis/api/swagger.yaml
        # location of user supplied API specifications
        user-api:
          - name: 'WLAN Access Information Service REST API'
            file: config/api/wais-api.yaml
          - name: 'V2X Information Service REST API'
            file: config/api/vis-api.yaml
        # resources available to docker container image
        docker-data:
          # location of entry script
          'entrypoint.sh': go-apps/meep-wais/entrypoint.sh
      meep-vis:
          'entrypoint.sh': go-apps/meep-vis/entrypoint.sh
          # location of grid map file
          'grid_map.yaml': go-packages/meep-vis-traffic-mgr/grid_map.yaml
      meep-tm:
        # location of source code
        src: go-apps/meep-vis
        src: go-apps/meep-tm
        # location of binary
        bin: bin/meep-vis
        bin: bin/meep-tm
        # location of deployment chart
        chart: charts/meep-vis
        chart: charts/meep-tm
        # user supplied value file located @ .meep/user/values (use below file name)
        chart-user-values: meep-vis.yaml
        chart-user-values: meep-tm.yaml
        # extra build flags
        build-flags:
          - -mod=vendor
@@ -829,18 +827,20 @@ repo:
        lint: true
        # location of API specifications
        api:
          - name: 'AdvantEDGE V2X Information REST API'
            file: go-apps/meep-vis/api/swagger.yaml
          - name: 'AdvantEDGE Bandwidth Management REST API'
            file: go-apps/meep-tm/api/bwm/swagger.yaml
          - name: 'AdvantEDGE Multi-access Traffic Steering REST API'
            file: go-apps/meep-tm/api/mts/swagger.yaml
        # location of user supplied API specifications
        user-api:
          - name: 'V2X Information Service REST API'
            file: config/api/vis-api.yaml
          - name: 'Bandwidth Management REST API'
            file: config/api/bwm-api.yaml
          - name: 'Multi-access Traffic Steering REST API'
            file: config/api/mts-api.yaml
        # resources available to docker container image
        docker-data:
          # location of entry script
          'entrypoint.sh': go-apps/meep-vis/entrypoint.sh
          # location of grid map file
          'grid_map.yaml': go-packages/meep-vis-traffic-mgr/grid_map.yaml
          'entrypoint.sh': go-apps/meep-tm/entrypoint.sh

  #------------------------------
  #  Dependencies
@@ -1017,16 +1017,16 @@ repo:
        src: go-packages/meep-app-support-client
        # supports linting
        lint: false
      meep-bwm-client:
        # location of source code
        src: go-packages/meep-bwm-client
        # supports linting
        lint: false
      meep-applications:
        # location of source code
        src: go-packages/meep-applications
        # supports linting
        lint: true
      meep-bwm-client:
        # location of source code
        src: go-packages/meep-bwm-client
        # supports linting
        lint: false
      meep-couch:
        # location of source code
        src: go-packages/meep-couch
@@ -1107,16 +1107,16 @@ repo:
        src: go-packages/meep-model
        # supports linting
        lint: true
      meep-mq:
        # location of source code
        src: go-packages/meep-mq
        # supports linting
        lint: true
      meep-mts-client:
        # location of source code
        src: go-packages/meep-mts-client
        # supports linting
        lint: false
      meep-mq:
        # location of source code
        src: go-packages/meep-mq
        # supports linting
        lint: true
      meep-net-char-mgr:
        # location of source code
        src: go-packages/meep-net-char-mgr
+54 −0
Original line number Diff line number Diff line
@@ -925,3 +925,57 @@ services:
        path: '/'
        method: 'GET'
        mode: 'block'
  #------------------------------
  #  Bandwidth Management Service (Sbox)
  #------------------------------
  - name: 'meep-tm'
    api: 'bwm'
    path: '/bwm/v1'
    sbox: true
    default:
      mode: 'allow'
    fileservers:
      - name: 'Api'
        path: '/api'
        mode: 'verify'
        roles:
          admin: 'allow'
          user: 'block'
      - name: 'UserApi'
        path: '/user-api'
        mode: 'verify'
        roles:
          admin: 'allow'
          user: 'allow'
    endpoints:
      - name: 'Index'
        path: '/'
        method: 'GET'
        mode: 'block'
  #------------------------------
  #  Multi-access Traffic Steering Service (Sbox)
  #------------------------------
  - name: 'meep-tm'
    api: 'mts'
    path: '/mts/v1'
    sbox: true
    default:
      mode: 'allow'
    fileservers:
      - name: 'Api'
        path: '/api'
        mode: 'verify'
        roles:
          admin: 'allow'
          user: 'block'
      - name: 'UserApi'
        path: '/user-api'
        mode: 'verify'
        roles:
          admin: 'allow'
          user: 'allow'
    endpoints:
      - name: 'Index'
        path: '/'
        method: 'GET'
        mode: 'block'
+34 −34
Original line number Diff line number Diff line
@@ -504,40 +504,6 @@ export function parseEdgeApps(scenario) {
                  enableInProgressCount: -1,
                  disableInProgressCount: -1
                });
              // MEC015
              } else if (proc.image.includes('meep-tm')) {
                // Bandwidth Management
                edgeApps.push({
                  id: proc.id,
                  name: proc.name+'-bwm',
                  instance: '',
                  img: proc.image,
                  mepName: pl.name,
                  env: proc.environment,
                  url: 'api/?urls.primaryName='+pl.name+'%20-%20Bandwidth%20Management%20API',
                  path: pl.name+'/bwm/v1',
                  pseudoName: 'MEC Bandwidth Management (015) on ' + pl.name,
                  dropDownName: 'MEC Bandwidth Management (015)',
                  enabled: true,  // always running
                  enableInProgressCount: -1,
                  disableInProgressCount: -1
                });
                // Multi-access Traffic Steering
                edgeApps.push({
                  id: proc.id,
                  name: proc.name+'-mts',
                  instance: '',
                  img: proc.image,
                  mepName: pl.name,
                  env: proc.environment,
                  url: 'api/?urls.primaryName='+pl.name+'%20-%20Multi-access%20Traffic%20Steering%20API',
                  path: pl.name+'/mts/v1',
                  pseudoName: 'MEC Multi-access Traffic Steering (015) on ' + pl.name,
                  dropDownName: 'MEC Multi-access Traffic Steering (015)',
                  enabled: true,  // always running
                  enableInProgressCount: -1,
                  disableInProgressCount: -1
                });
              // MEC021
              } else if (proc.image.includes('meep-ams')) {
                edgeApps.push({
@@ -590,6 +556,40 @@ export function parseEdgeApps(scenario) {
                  enableInProgressCount: -1,
                  disableInProgressCount: -1
                });
              // MEC015
              } else if (proc.image.includes('meep-tm')) {
                // Bandwidth Management
                edgeApps.push({
                  id: proc.id,
                  name: proc.name+'-bwm',
                  instance: '',
                  img: proc.image,
                  mepName: pl.name,
                  env: proc.environment,
                  url: 'api/?urls.primaryName='+pl.name+'%20-%20Bandwidth%20Management%20REST%20API',
                  path: pl.name+'/bwm/v1',
                  pseudoName: 'Bandwidth Management (015) on ' + pl.name,
                  dropDownName: 'Bandwidth Management (015)',
                  enabled: true,  // always running
                  enableInProgressCount: -1,
                  disableInProgressCount: -1
                });
                // Multi-access Traffic Steering
                edgeApps.push({
                  id: proc.id,
                  name: proc.name+'-mts',
                  instance: '',
                  img: proc.image,
                  mepName: pl.name,
                  env: proc.environment,
                  url: 'api/?urls.primaryName='+pl.name+'%20-%20Multi-access%20Traffic%20Steering%20REST%20API',
                  path: pl.name+'/mts/v1',
                  pseudoName: 'Multi-access Traffic Steering (015) on ' + pl.name,
                  dropDownName: 'Multi-access Traffic Steering (015)',
                  enabled: true,  // always running
                  enableInProgressCount: -1,
                  disableInProgressCount: -1
                });
              // MEC011
              } else if (proc.image.includes('meep-app-enablement')) {
                // App support
+1 −1

File changed.

Contains only whitespace changes.