Commit 4251290b authored by Miguel Angel Reina Ortega's avatar Miguel Angel Reina Ortega
Browse files

Merge branch 'TemporaryMergeToMaster' into 'master' 

Merging to master before to start STF 685/STF 707 developments

Closes #4, #2, #12, #13, and #14

See merge request !14
parents 153124ab b677bb97

.meepctl-repocfg.yaml

+204 −6
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ repo: 
      # https config

      https-port: 443

      # certificate authority (none|self-signed|lets-encrypt) default: none

      ca: lets-encrypt

      ca: self-signed

      # lets-encrypt production server (true) or staging server (false)

      le-server-prod: true
@@ -104,7 +104,7 @@ repo: 
        # enable influx data backups

        enabled: true

        # object store url

        url: https://metrics.mec-platform.etsi.org/

        url: https://metrics.try-mec.etsi.org/

        # object store configuration secret

        secret: meep-influx-objstore-config

        # Number of days to retain daily data backups
@@ -152,11 +152,11 @@ repo: 
            # 1h downsampled data retention

            resolution-1h: 10y

      # Thanos long-term storage archive

      thanos-archive:

      #thanos-archive:

        # enable Thanos archive

        enabled: true

        # enabled: true

        # archive object store configuration secret

        secret: meep-thanos-archive-objstore-config

        #secret: meep-thanos-archive-objstore-config



    # Garbage Collection configuration

    gc:
@@ -308,6 +308,8 @@ repo: 
          # - meep-tc-engine

          # - meep-app-enablement

          # - meep-vis

          # - meep-iot

          # - meep-sss

          # - meep-federation

        # location of API specifications

        api:
@@ -423,9 +425,15 @@ repo: 
          meep-app-enablement: charts/meep-app-enablement

          meep-virt-chart-templates: charts/meep-virt-chart-templates

          meep-vis: charts/meep-vis

          meep-iot: charts/meep-iot

          meep-sss: charts/meep-sss

          meep-federation: charts/meep-federation

          meep-cloud-mosquitto: charts/meep-cloud-mosquitto

          meep-mosquitto: charts/meep-mosquitto

          meep-acme-mn-cse: charts/meep-acme-mn-cse

          meep-acme-in-cse: charts/meep-acme-in-cse

          meep-tinyiot-mn-cse: charts/meep-tinyiot-mn-cse

          meep-tinyiot-in-cse: charts/meep-tinyiot-in-cse

        # list of sandbox specific pods

        sandbox-pods:

          - meep-gis-engine
@@ -441,6 +449,8 @@ repo: 
          # - meep-tc-engine

          # - meep-app-enablement

          # - meep-vis

          # - meep-iot

          # - meep-sss

          # - meep-federation

      meep-webhook:

        # location of source code
@@ -944,6 +954,74 @@ repo: 
          '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-iot:

        # location of source code

        src: go-apps/meep-iot

        # location of binary

        bin: bin/meep-iot

        # location of deployment chart

        chart: charts/meep-iot

        # user supplied value file located @ .meep/user/values (use below file name)

        chart-user-values: meep-iot.yaml

        # extra build flags

        build-flags:

          - -mod=vendor

        # enable meepctl build

        build: true

        # enable meepctl dockerize

        dockerize: true

        # enable meepctl deploy/delete

        deploy: true

        # supports code coverage measurement when built in codecov mode

        codecov: true

        # supports linting

        lint: true

        # location of API specifications

        api:

          - name: 'AdvantEDGE IOT APIs REST API'

            file: go-apps/meep-iot/api/swagger.yaml

        # location of user supplied API specifications

        user-api:

          - name: 'IOT APIs REST API'

            file: config/api/iot-api.yaml

        # resources available to docker container image

        docker-data:

          # location of entry script

          'entrypoint.sh': go-apps/meep-iot/entrypoint.sh

      meep-sss:

        # location of source code

        src: go-apps/meep-sss

        # location of binary

        bin: bin/meep-sss

        # location of deployment chart

        chart: charts/meep-sss

        # user supplied value file located @ .meep/user/values (use below file name)

        chart-user-values: meep-sss.yaml

        # extra build flags

        build-flags:

          - -mod=vendor

        # enable meepctl build

        build: true

        # enable meepctl dockerize

        dockerize: true

        # enable meepctl deploy/delete

        deploy: true

        # supports code coverage measurement when built in codecov mode

        codecov: true

        # supports linting

        lint: true

        # location of API specifications

        api:

          - name: 'AdvantEDGE SENSORS SHARING APIs REST API'

            file: go-apps/meep-sss/api/swagger.yaml

        # location of user supplied API specifications

        user-api:

          - name: 'SENSORS SHARING APIs REST API'

            file: config/api/sss-api.yaml

        # resources available to docker container image

        docker-data:

          # location of entry script

          'entrypoint.sh': go-apps/meep-sss/entrypoint.sh

      meep-federation:

        # location of source code

        src: go-apps/meep-federation
@@ -978,7 +1056,97 @@ repo: 
        docker-data:

          # location of entry script

          'entrypoint.sh': go-apps/meep-federation/entrypoint.sh



      meep-mosquitto:

        # location of source code

        src: go-apps/meep-mosquitto

        bin: bin/meep-mosquitto

        # enable meepctl build

        build: false

        # enable meepctl dockerize

        dockerize: true

        # enable meepctl deploy/delete

        deploy: false

        # supports code coverage measurement when built in codecov mode

        codecov: false

        # supports linting

        lint: false

        docker-data:

          'mosquitto.conf': go-apps/meep-mosquitto/mosquitto.conf

          'listener.conf': go-apps/meep-mosquitto/listener.conf

          'entrypoint.sh': go-apps/meep-mosquitto/entrypoint.sh

      meep-tinyiot-in-cse:

        # location of source code

        src: go-apps/meep-iot-pltf/tinyiot-in-cse

        bin: bin/meep-iot-pltf/meep-tinyiot-in-cse

        # enable meepctl build

        build: false

        # enable meepctl dockerize

        dockerize: true

        # enable meepctl deploy/delete

        deploy: false

        # supports code coverage measurement when built in codecov mode

        codecov: false

        # supports linting

        lint: false

        # TinyIoT resources available to docker container image

        docker-data:

          'entrypoint.sh': go-apps/meep-iot-pltf/tinyiot-in-cse/entrypoint.sh

          'source': go-apps/meep-iot-pltf/tinyiot-in-cse/tinyIoT/source

      meep-tinyiot-mn-cse:

        # location of source code

        src: go-apps/meep-iot-pltf/tinyiot-mn-cse

        bin: bin/meep-iot-pltf/meep-tinyiot-mn-cse

        # enable meepctl build

        build: false

        # enable meepctl dockerize

        dockerize: true

        # enable meepctl deploy/delete

        deploy: false

        # supports code coverage measurement when built in codecov mode

        codecov: false

        # supports linting

        lint: false

        # TinyIoT resources available to docker container image

        docker-data:

          'entrypoint.sh': go-apps/meep-iot-pltf/tinyiot-mn-cse/entrypoint.sh

          'source': go-apps/meep-iot-pltf/tinyiot-mn-cse/tinyIoT/source

      meep-in-cse:

        # location of source code

        src: go-apps/meep-iot-pltf/in-cse

        bin: bin/meep-iot-pltf/in-cse

        # enable meepctl build

        build: false

        # enable meepctl dockerize

        dockerize: true

        # enable meepctl deploy/delete

        deploy: false

        # supports code coverage measurement when built in codecov mode

        codecov: false

        # supports linting

        lint: false

        docker-data:

          # location of entry script

          'entrypoint.sh': go-apps/meep-iot-pltf/in-cse/entrypoint.sh

          'acme.ini': go-apps/meep-iot-pltf/in-cse/acme.ini

      meep-om2m-acme:

        # location of source code

        src: go-apps/meep-iot-pltf/acme

        bin: bin/meep-iot-pltf/acme

        # enable meepctl build

        build: false

        # enable meepctl dockerize

        dockerize: true

        # enable meepctl deploy/delete

        deploy: false

        # supports code coverage measurement when built in codecov mode

        codecov: false

        # supports linting

        lint: false

        docker-data:

          # location of entry script

          'entrypoint.sh': go-apps/meep-iot-pltf/acme/entrypoint.sh

          'acme.ini': go-apps/meep-iot-pltf/acme/acme.ini

          'acme': go-apps/meep-iot-pltf/acme/acme

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

  #  Dependencies

  #------------------------------
@@ -1339,6 +1507,36 @@ repo: 
        src: go-packages/meep-wais-client

        # supports linting

        lint: false

      meep-vis-client:

        # location of source code

        src: go-packages/meep-dai-client

        # supports linting

        lint: false

      meep-iot-client:

        # location of source code

        src: go-packages/meep-iot-client

        # supports linting

        lint: false

      meep-sss-client:

        # location of source code

        src: go-packages/meep-sss-client

        # supports linting

        lint: false

      meep-federation-mgr:

        # location of source code

        src: go-packages/meep-federation-mgr

        # supports linting

        lint: false

      meep-vis-traffic-mgr:

        # location of source code

        src: go-packages/meep-dai-mgr

        # supports linting

        lint: false

      meep-iot-mgr:

        # location of source code

        src: go-packages/meep-iot-mgr

        # supports linting

        lint: false

      meep-vis-client:

        # location of source code

        src: go-packages/meep-vis-client

AUTHORS

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

xFlow Research (Pvt.) Inc.

FSCOM



[v1.11.0 xFlow/FSCOM]

InterDigital Communications Inc

xFlow Research (Pvt.) Inc.

FSCOM

README.md

+7 −1
Original line number Diff line number Diff line
@@ -20,13 +20,19 @@ 


------



**_What's New in v1.11.0 xFlow/FSCOM!_**



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



:zap: ** [ETSI MEC033](https://interdigitalinc.github.io/AdvantEDGE/docs/overview/edge-services/#iot-api) and [ETSI MEC046](https://interdigitalinc.github.io/AdvantEDGE/docs/overview/edge-services/#mec-sensors-sharing) :arrow_up:**



**_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: **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) and [ETSI MEC040](https://interdigitalinc.github.io/AdvantEDGE/docs/overview/edge-services/#mec-federation-service) :arrow_up:**



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

charts/meep-acme-in-cse/Chart.yaml

0 → 100644
+5 −0
Original line number Diff line number Diff line 
apiVersion: v2

appVersion: "1.0.0"

description: MEEP OM2M ACME IN-CSE Service Helm chart for Kubernetes

name: meep-acme-in-cse

version: 1.0.0

charts/meep-acme-in-cse/templates/_helpers.tpl

0 → 100644
+32 −0
Original line number Diff line number Diff line 
{{/* vim: set filetype=mustache: */}}

{{/*

Expand the name of the chart.

*/}}

{{- define "meep-acme-in-cse.name" -}}

{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}

{{- end -}}



{{/*

Create a default fully qualified app name.

We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).

If release name contains chart name it will be used as a full name.

*/}}

{{- define "meep-acme-in-cse.fullname" -}}

{{- if .Values.fullnameOverride -}}

{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}

{{- else -}}

{{- $name := default .Chart.Name .Values.nameOverride -}}

{{- if contains $name .Release.Name -}}

{{- .Release.Name | trunc 63 | trimSuffix "-" -}}

{{- else -}}

{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}

{{- end -}}

{{- end -}}

{{- end -}}



{{/*

Create chart name and version as used by the chart label.

*/}}

{{- define "meep-acme-in-cse.chart" -}}

{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}

{{- end -}}