diff options
| author |   Vijay Venkatesh Kumar <vv770d@att.com> | 2020-02-26 23:42:42 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2020-02-26 23:42:42 +0000 |
| commit | 77f2732015a0ab038bf6be6afaf924b827f44835 (patch) | |
| tree | 24929b885120baa1b2db4f1bde67a1fde6e8245e | |
| parent | d0fae040ebc6de8eea6b281429275fb53a78704e (diff) | |
| parent | 34b776928e1a0fa029d2de13a020873bff8a601f (diff) | |
Merge "Updates to onboarding and distributor api's"
| -rw-r--r-- | mod/distributorapi/setup.py | 1 | ||||
| -rw-r--r-- | mod/onboardingapi/ChangeLog.md | 3 | ||||
| -rw-r--r-- | mod/onboardingapi/setup.py | 4 | ||||
| -rwxr-xr-x | mod/onboardingapi/start.sh | 2 |
4 files changed, 8 insertions, 2 deletions
diff --git a/mod/distributorapi/setup.py b/mod/distributorapi/setup.py index 3d0acfd..4a09471 100644 --- a/mod/distributorapi/setup.py +++ b/mod/distributorapi/setup.py @@ -34,6 +34,7 @@ setup( start-distributor-api=distributor.http:start_http_server """, install_requires=[ + "Werkzeug==0.16.1", "flask-restplus" , "Flask-Cors" , "requests" diff --git a/mod/onboardingapi/ChangeLog.md b/mod/onboardingapi/ChangeLog.md index 675184d..21d0f0c 100644 --- a/mod/onboardingapi/ChangeLog.md +++ b/mod/onboardingapi/ChangeLog.md @@ -15,6 +15,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/). * Enhance Docker image creation to generate the dcae-cli configuration at runtime rather than at build time * Fix format_description to handle no description case * Add filtering by name, version for GET /components +* Modify server url in start.sh to point to new spec file +* Change dcae cli version in start.sh to 2.12.0 +* Change werkzeug dependency version in setup.py ## [2.11.3] diff --git a/mod/onboardingapi/setup.py b/mod/onboardingapi/setup.py index 438732c..6ad35a7 100644 --- a/mod/onboardingapi/setup.py +++ b/mod/onboardingapi/setup.py @@ -42,7 +42,9 @@ setup( dcae_cli=dcae_cli.cli:cli """, setup_requires=['pytest-runner'], - install_requires=['python-consul<1.0.0', + install_requires=[ + 'Werkzeug==0.16.1', + 'python-consul<1.0.0', 'six', 'sqlalchemy', 'SQLAlchemy-Utils', diff --git a/mod/onboardingapi/start.sh b/mod/onboardingapi/start.sh index 8b3978d..615dac3 100755 --- a/mod/onboardingapi/start.sh +++ b/mod/onboardingapi/start.sh @@ -9,7 +9,7 @@ fi if [ ! -f ~/.config/dcae-cli/config.json ]; then echo "Creating dcae-cli config" # TODO: Make this into a variable that gets fed in via docker run - echo "{\"server_url\": \"https://git.onap.org/dcaegen2/platform/cli/plain\", \"user\": \"api\", \"db_url\": \"$PG_CONN\", \"cli_version\": \"2.11.1\", \"path_component_spec\": \"/component-json-schemas/component-specification/dcae-cli-v2/component-spec-schema.json\", \"path_data_format\": \"/component-json-schemas/data-format/dcae-cli-v1/data-format-schema.json\"}" > ~/.config/dcae-cli/config.json + echo "{\"server_url\": \"https://git.onap.org/dcaegen2/platform/tree/mod\", \"user\": \"api\", \"db_url\": \"$PG_CONN\", \"cli_version\": \"2.12.0\", \"path_component_spec\": \"/component-json-schemas/component-specification/dcae-cli-v2/component-spec-schema.json\", \"path_data_format\": \"/component-json-schemas/data-format/dcae-cli-v1/data-format-schema.json\"}" > ~/.config/dcae-cli/config.json fi dcae_cli http --live |