Commit 320b224a authored by Michel Roy's avatar Michel Roy
Browse files

Merge branch 'kd_sp49_code_rev' into 'develop' 

Support for AdvantEDGE v1.6.0 + minor fixes + installation documentation update

See merge request stf-587/mec-sandbox!1
parents 5be0cdfa 3e8adfbd

README.md

+129 −7
Original line number Diff line number Diff line 


# ETSI MEC Sandbox

MEC Sandbox is an interactive environment that enables users to learn & experiment with ETSI MEC Service APIs.

These standardised RESTful APIs are targeted towards MEC application developers to expose the value added services

offered by MEC, including real time access to network and context information, as well as location awareness.

The design principles for developing the APIs have also been specified in ETSI GS MEC 009, along with http methods,

templates, conventions and patterns. The MEC service APIs are available in YAML and JSON format at https://forge.etsi.org,

presented via OpenAPI compliant descriptions.



MEC Sandbox provides the user with a choice of scenarios combining different network technologies (4G, 5G, Wi-Fi) and

terminal types. Combining these assets in a geolocated environment, a user can gain hands-on experience on the behaviour

and capabilities of the Location (MEC013), Radio Network Information (MEC012) and WLAN Information (MEC028) service APIs.

Such contextual information can offer significant differential performance for edge based MEC applications.



MEC Sandbox is an interactive environment that enables users to learn & experiment with ETSI MEC Service APIs. These standardised RESTful APIs are targeted towards MEC application developers to expose the value added services offered by MEC, including real time access to network and context information, as well as location awareness. The design principles for developing the APIs have also been specified in ETSI GS MEC 009, along with http methods, templates, conventions and patterns. The MEC service APIs are available in YAML and JSON format at https://forge.etsi.org, presented via OpenAPI compliant descriptions.

MEC Sandbox deploys the [AdvantEDGE edge emulation platform](https://github.com/InterDigitalInc/AdvantEDGE) to provide

real-time access to ETSI MEC service implementations.



MEC Sandbox provides the user with a choice of scenarios combining different network technologies (4G, 5G, Wi-Fi) and terminal types. Combining these assets in a geolocated environment, a user can gain hands-on experience on the behaviour and capabilities of the Location (MEC013), Radio Network Information (MEC012) and WLAN Information (MEC028) service APIs. Such contextual information can offer significant differential performance for edge based MEC applications.

The MEC Sandbox frontend (provided in this repo) uses the AdvantEDGE platform & service REST APIs to create secure,

user-specific sandboxes where signed-in users can:

- Deploy & dynamically configure a scenario

- Try-out the MEC Service APIs using Swagger UI

- Interact with the MEC Services directly from a user MEC Application



## Getting Started

To use the MEC Sandbox, check out the [live deployment](https://try-mec.etsi.org).



TODO - Add details

To learn more about the MEC Sandbox, have a look at the [wiki page](https://mecwiki.etsi.org/index.php?title=MEC_Sandbox_Help).



### Install & Deploy

To install the MEC Sandbox, follow the installation instructions below.



TODO - Add details

## Install MEC Sandbox



## Licensing

### Prerequisites

MEC Sandbox has the following prerequisites:



1. [AdvantEDGE](https://github.com/InterDigitalInc/AdvantEDGE/wiki) runtime & development environments

   - Install [runtime environment](https://github.com/InterDigitalInc/AdvantEDGE/wiki/runtime-environment)

   - Install [development environment](https://github.com/InterDigitalInc/AdvantEDGE/wiki/development-environment)

1. OAuth Applications using external providers

   - **GitHub:**

     - github.com User Account --> Settings --> Developer settings --> OAuth Apps --> New OAuth App

     - _Application Name:_ ETSI MEC Sandbox

     - _Homepage URL:_ https://try-mec.etsi.org

     - _Application description:_ Optional description...

     - _Authorization callback URL:_ https://try-mec.etsi.org/platform-ctrl/v1/authorize

     - **NOTES:**

       - You can also add an application logo if you want users to see one during authentication

       - Once created, keep note of the OAuth App Client ID & Secret; this secret is only temporarily available on GitHub... keep a copy in a safe place!

       - If you need to generate a new secret the MEC Sandbox will have to be updated accordingly

   - **GitLab:**

     - gitlab.com User Account --> Settings --> Applications --> Add new application

     - _Name:_ ETSI MEC Sandbox

     - _Redirect URI:_ https://try-mec.etsi.org/platform-ctrl/v1/authorize

     - _Confidential:_ Unchecked

     - _Scopes:_ read_user

     - **NOTES:**

       - Once created, keep note of the OAuth App Client ID & Secret



### Build & Deploy

Build and deploy the MEC Sandbox as follows:



MEC Sandbox is licensed under under the [Apache License, Version 2.0](https://forge.etsi.org/rep/stf-587/mec-sandbox/blob/master/LICENSE)
 
1. Stop AdvantEDGE (if running)

   - Delete user sandboxes

     - Using AdvantEDGE frontend:

       - Login as admin @ https://try-mec.etsi.org

       - Open AdvantEDGE frontend @ https://try-mec.etsi.org/alt

       - Go to Exec Page and delete user sandboxes

     - Manually:

       - `helm ls -A --short | grep <sandbox-name> | xargs -L1 helm delete`

   - Delete core & dependency microservices:

     - `meepctl delete core`

     - `meepctl delete dep`

     - **NOTE:** This will clear all sessions in Redis DB

1. Build & Deploy STF Frontend:

   - Fetch required MEC Sandbox baseline

     - Clone & upload this repo to the MEC Sandbox deployment VM

     - Place repo in home folder

   - SSH to MEC Sandbox deployment VM

   - Build STF Frontend:

     - `cd ~/mec-sandbox`

     - `./build.sh`

   - Deploy STF Frontend & Configuration files:

     - `./deploy.sh`

     - **NOTE:** This updates the `~/.meep/user/` folder with the user frontend, sandbox swagger UI, and user chart values.yaml overrides

1. Fetch & Configure AdvantEDGE:

   - Fetch required AdvantEDGE baseline

     - Clone & upload AdvantEDGE repo to the MEC Sandbox deployment VM

     - Place repo in home folder

     - Checkout the required AdvantEDGE version tag

   - Update deployment config & permissions files (from MEC Sandbox):

     - `cp ~/mec-sandbox/config/.meepctl-repocfg.yaml ~/AdvantEDGE/.meepctl-repocfg.yaml`

       - **NOTE:** Verify the Deployment config section values before deploying the platform

     - `cp ~/mec-sandbox/config/permissions.yaml ~/AdvantEDGE/config/permissions.yaml`

   - Configure session & OAuth secrets:

     - `vi ~/AdvantEDGE/config/secrets.yaml`

       - Set a unique session encryption key

       - Set the OAuth provider client ID & secrets using the values from the OAuth Applications

     - `python ~/AdvantEDGE/config/configure-secrets.py set ~/AdvantEDGE/config/secrets.yaml`

       - To install Python2: `sudo apt install python-minimal`

       - To install Python-pip: `sudo apt install python-pip`

       - **NOTE:** Once the kuberentes secrets have been created, it is recommended to remove the `~/AdvantEDGE/config/secrets.yaml` file containing the clear-text secrets

1. Build & Deploy AdvantEDGE:

   - Build meepctl:

     - `~/AdvantEDGE/go-apps/meepctl/install.sh`

   - Deploy dependency pods:

     - `meepctl deploy dep`

   - Build & Dockerize:

     - `meepctl build all`

     - `meepctl dockerize all`

   - Prune old docker images:

     - `docker image prune`

   - Deploy Core pods:

     - `meepctl deploy core`

     - **NOTE:** Wait for dep pods to be successfully deployed before deploying core



### Configure Scenarios

If necessary, configure the MEC Sandbox scenarios as follows:



1. Provide _admin_ privileges to a user account

   - SSH to MEC Sandbox machine

   - SSH into _meep-postgis-0_ pod

   - Login & connect to PostgreSQL user role database:

     - `psql -U postgres`

     - `\c meep_platform_ctrl`

   - Add entry to give _admin_ rights to a specific username from a specific provider. Examples:

     - `INSERT INTO users (provider, username, password, sboxname, role) VALUES ('github', 'user1', '', 'sbx-user1','admin');`

     - `INSERT INTO users (provider, username, password, sboxname, role) VALUES ('gitlab', 'user2', '', 'sbx-user2','admin');`

   - List configured user roles to verify proper configuration:

     - `SELECT * from users;`

1. Sign in to MEC Sandbox using an account with _admin_ privileges

   - Login as admin user @ https://try-mec.etsi.org

1. Open the AdvantEDGE frontend

   - Open AdvantEDGE frontend @ https://try-mec.etsi.org/alt

1. Import & save MEC Sandbox scenarios

   - In the AdvantEDGE Configuration view, import the required scenario _yaml_ file

   - Save the imported scenario to the AdvantEDGE backend to make it available in the MEC Sandbox



## Licensing

MEC Sandbox is a private repo with all rights reserved to ETSI.

config/.meepctl-repocfg.yaml

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
# See the License for the specific language governing permissions and

# limitations under the License.



version: 1.5.10

version: 1.6.0

repo:

  name: AdvantEDGE

js-apps/frontend/package-lock.json

+24 −828

File changed.

Preview size limit exceeded, changes collapsed.

js-apps/frontend/package.json

+1 −36
Original line number Diff line number Diff line
@@ -4,9 +4,6 @@ 
  "description": "",

  "private": true,

  "scripts": {

    "test": "jest",

    "test:verbose": "jest --verbose true",

    "test:coverage": "jest --verbose true --coverage --colors",

    "build": "webpack",

    "build:dev": "webpack-dev-server --https true --port 8091 --host 10.190.114.150 --env.MEEP_HOST=10.190.114.150"

  },
@@ -20,9 +17,6 @@ 
    "babel-jest": "^24.1.0",

    "babel-loader": "^8.0.4",

    "css-loader": "^0.28.11",

    "enzyme": "^3.9.0",

    "enzyme-adapter-react-16": "^1.10.0",

    "enzyme-to-json": "^3.3.5",

    "extract-loader": "^2.0.1",

    "extract-text-webpack-plugin": "^4.0.0-beta.0",

    "file-loader": "^1.1.11",
@@ -39,16 +33,8 @@ 
  },

  "dependencies": {

    "@material-ui/core": "^1.5.1",

    "@material-ui/icons": "^1.1.1",

    "@types/tinycolor2": "^1.4.2",

    "axios": "^0.18.0",

    "classnames": "2.2.6",

    "d3": "^5.9.7",

    "d3-force": "^2.0.1",

    "d3-hierarchy": "^1.1.8",

    "http-status-codes": "^2.1.4",

    "ionicons": "^2.0.1",

    "jquery": "3.3.1",

    "leaflet": "1.6.0",

    "lodash": "^4.17.11",

    "mapbox-gl": "1.10.1",
@@ -57,33 +43,12 @@ 
    "material-design-icons": "3.0.1",

    "prop-types": "15.6.2",

    "react": "^16.8.6",

    "react-d3-axis": "^0.1.2",

    "react-d3-graph": "^2.0.2",

    "react-dom": "^16.8.6",

    "react-iframe": "^1.5.0",

    "react-redux": "^5.1.1",

    "react-split-pane": "^0.1.87",

    "react-tooltip": "^3.10.0",

    "redux": "^4.0.1",

    "redux-thunk": "^2.3.0",

    "reselect": "^4.0.0",

    "rmwc": "^4.0.6",

    "tinycolor2": "^1.4.1",

    "warning": "^4.0.1",

    "yamljs": "0.3.0"

  },

  "jest": {

    "setupFilesAfterEnv": [

      "<rootDir>/test/setup/setupEnzyme.js"

    ],

    "roots": [

      "test"

    ],

    "testPathIgnorePatterns": [

      "<rootDir>/test/setup/"

    ],

    "collectCoverageFrom": [

      "src/**/*.{js,jsx}"

    ]

    "warning": "^4.0.1"

  }

}

js-apps/frontend/src/js/components/dialogs/basic-dialog.js

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ const BasicDialog = props => { 
        var closeOnSubmit = (evt.detail.action === 'accept' ? true : false);

        props.onClose(closeOnSubmit);

      }}

      className={(props.className) ? props.className : ''}

      className={props.className ? props.className : ''}

    >

      <DialogTitle theme="primary" style={styles.title}>

        <Typography use="headline5">{props.title}</Typography>