summaryrefslogtreecommitdiffstats
path: root/mod
diff options
context:
space:
mode:
authorTony Hansen <tony@att.com>2021-10-12 20:19:19 +0000
committerGerrit Code Review <gerrit@onap.org>2021-10-12 20:19:19 +0000
commit17336c26927fdc4d8bc74b051e34fb1d175c219c (patch)
treea282c88cb2b054dbc78b72733d80635bfe21d740 /mod
parentff94acee8b41511dcd7f339778c87ca5931e8668 (diff)
parent8852e683a9cd036f1b0d7cb38153b88eded329de (diff)
Merge "[MOD/onboarding] Switch to v3 component spec"
Diffstat (limited to 'mod')
-rw-r--r--mod/onboardingapi/ChangeLog.md6
-rw-r--r--mod/onboardingapi/Dockerfile5
-rw-r--r--mod/onboardingapi/pom.xml4
-rw-r--r--mod/onboardingapi/setup.py2
4 files changed, 13 insertions, 4 deletions
diff --git a/mod/onboardingapi/ChangeLog.md b/mod/onboardingapi/ChangeLog.md
index ede9878..1de9363 100644
--- a/mod/onboardingapi/ChangeLog.md
+++ b/mod/onboardingapi/ChangeLog.md
@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/)
and this project adheres to [Semantic Versioning](http://semver.org/).
+## [2.13.0] - 2021/09/21
+
+Changed
+ - [DCAEGEN2-2876] - Support v3 component spec for helm flow support
+
+
## [2.12.5]
* Fix component-spec-schema bug: Failed validating 'oneOf' in schema['properties']['volumes']['items']
diff --git a/mod/onboardingapi/Dockerfile b/mod/onboardingapi/Dockerfile
index d25d183..e5ca734 100644
--- a/mod/onboardingapi/Dockerfile
+++ b/mod/onboardingapi/Dockerfile
@@ -1,5 +1,6 @@
# ============LICENSE_START=======================================================
# Copyright 2020 Deutsche Telekom. All rights reserved.
+# Copyright (c) 2021 AT&T Intellectual Property. All rights reserved.
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,7 +17,7 @@
FROM nexus3.onap.org:10001/onap/integration-python:7.0.1
ENV SERVER_URL=https://git.onap.org/dcaegen2/platform/plain/mod
-ENV PATH_COMPONENT_SPEC=/component-json-schemas/component-specification/dcae-cli-v2/component-spec-schema.json
+ENV PATH_COMPONENT_SPEC=/component-json-schemas/component-specification/dcae-cli-v3/component-spec-schema.json
ENV PATH_DATA_FORMAT=/component-json-schemas/data-format/dcae-cli-v1/data-format-schema.json
ENV PG_CONN=
@@ -30,8 +31,10 @@ RUN apk update && \
mkdir schemas && \
wget -O schemas/compspec.json $SERVER_URL$PATH_COMPONENT_SPEC && \
wget -O schemas/dataformat.json $SERVER_URL$PATH_DATA_FORMAT && \
+ pip install --upgrade pip && \
pip install .
+
USER onap
EXPOSE 8080
diff --git a/mod/onboardingapi/pom.xml b/mod/onboardingapi/pom.xml
index c9da793..e208b08 100644
--- a/mod/onboardingapi/pom.xml
+++ b/mod/onboardingapi/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!--
================================================================================
-Copyright (c) 2017-2020 AT&T Intellectual Property. All rights reserved.
+Copyright (c) 2017-2021 AT&T Intellectual Property. All rights reserved.
Copyright 2020 Deutsche Telekom. All rights reserved.
Copyright 2021 Nokia All rights reserved.
================================================================================
@@ -24,7 +24,7 @@ limitations under the License.
<groupId>org.onap.dcaegen2.platform.mod</groupId>
<artifactId>dcaegen2-platform-mod-onboardingapi</artifactId>
<name>dcaegen2-platform-mod-onboardingapi</name>
- <version>2.12.5-SNAPSHOT</version>
+ <version>2.13.0-SNAPSHOT</version>
<url>http://maven.apache.org</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/mod/onboardingapi/setup.py b/mod/onboardingapi/setup.py
index 12eabc0..7f3bee2 100644
--- a/mod/onboardingapi/setup.py
+++ b/mod/onboardingapi/setup.py
@@ -47,7 +47,7 @@ setup(
'Werkzeug==0.16.1',
'python-consul<1.0.0',
'six',
- 'sqlalchemy',
+ 'sqlalchemy==1.3.23',
'SQLAlchemy-Utils',
'click>=6.0,<7.0',
'jsonschema',