diff options
| author |   Michal Jagiello <michal.jagiello@t-mobile.pl> | 2023-09-27 09:12:41 +0200 |
|---|---|---|
| committer | Michal Jagiello <michal.jagiello@t-mobile.pl> | 2023-09-27 09:27:05 +0200 |
| commit | 7d764e28301a3c98c3a42a6926e524a4d2b3c6d9 (patch) | |
| tree | a0d253944a7331872a5f0a357d666ba02d6b92de | |
| parent | 013329754f7a70695dbc306f33f7e09111416337 (diff) | |
Data provider 0.7.2 version0.7.2
Uses latest onapsdk and fix passing few parameters
Issue-ID: INT-2264
Signed-off-by: Michal Jagiello <michal.jagiello@t-mobile.pl>
Change-Id: I73d80a0d81661a6082a04414f2623df3725165cb
| -rw-r--r-- | Dockerfile | 6 | ||||
| -rw-r--r-- | onap_data_provider/resources/service_instance_resource.py | 6 | ||||
| -rw-r--r-- | requirements.txt | 2 | ||||
| -rw-r--r-- | setup.py | 6 |
4 files changed, 10 insertions, 10 deletions
@@ -1,12 +1,12 @@ -FROM python:3.10.4-slim AS builder +FROM python:3.11.4-slim AS builder COPY requirements.txt /opt/app/onap_data_provider/requirements.txt WORKDIR /opt/app/onap_data_provider/ -RUN python -m pip install -r requirements.txt --prefix=/opt/install +RUN python -m pip install -r requirements.txt --prefix=/opt/install --no-build-isolation -FROM nexus3.onap.org:10001/onap/integration-python:10.0.0 +FROM nexus3.onap.org:10001/onap/integration-python:12.0.0 COPY --from=builder --chown=onap:onap /opt/install /usr/local diff --git a/onap_data_provider/resources/service_instance_resource.py b/onap_data_provider/resources/service_instance_resource.py index b23de40..4c3da81 100644 --- a/onap_data_provider/resources/service_instance_resource.py +++ b/onap_data_provider/resources/service_instance_resource.py @@ -122,9 +122,9 @@ class ServiceInstanceResource(Resource): sdc_service=service, customer=self.customer, owning_entity=owning_entity, - project=Project(self.data["project"]), - line_of_business=LineOfBusiness(self.data["line_of_business"]), - platform=Platform(self.data["platform"]), + project=Project(self.data["project"]).name, + line_of_business=LineOfBusiness(self.data["line_of_business"]).name, + platform=Platform(self.data["platform"]).name, cloud_region=cloud_region, tenant=tenant, service_instance_name=self.data["service_instance_name"], diff --git a/requirements.txt b/requirements.txt index 193720d..2e42ade 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,3 @@ -onapsdk==10.3.2 +onapsdk==12.3.2 PyYAML~=5.4.1 jsonschema==4.4.0 @@ -21,8 +21,8 @@ with open("README.md", "r", encoding="utf-8") as readme: setuptools.setup( name="onap_data_provider", - version="0.7.1", - author="Michal Jagiello <michal.jagiello@t-mobile.pl>, Piotr Stanior <piotr.stanior@t-mobile.pl>, Pawel Denst <pawel.denst@external.t-mobile.pl>", + version="0.7.2", + author="Michal Jagiello <michal.jagiello@t-mobile.pl>, Piotr Stanior <piotr.stanior@t-mobile.pl>, Pawel Denst <pawel.denst@external.t-mobile.pl>", description="Tool to provide data for ONAP instances", long_description=long_description, long_description_content_type="text/markdown", @@ -35,7 +35,7 @@ setuptools.setup( "onap-data-provider=onap_data_provider.data_provider:run", ] }, - install_requires=["onapsdk==10.3.2", "PyYAML~=5.4.1", "jsonschema==4.4.0"], + install_requires=["onapsdk==12.3.2", "PyYAML~=5.4.1", "jsonschema==4.4.0"], classifiers=[ "Development Status :: 5 - Production/Stable", "Programming Language :: Python", |