From ef50809c847aca4a198c89fb846eb44046036032 Mon Sep 17 00:00:00 2001 From: Michal Jagiello Date: Fri, 10 Mar 2023 14:20:39 +0000 Subject: Bump version of onapsdk and use k8s plugin (not via msb) The newest version of onapsdk fix some bugs but most important it uses k8s plugin API and not MSB (which is deprecated) Issue-ID: OOM-3117 Signed-off-by: Michal Jagiello Change-Id: I56d43dff41b0762b983e59d9f364b3c8c8226537 --- requirements.txt | 2 +- src/onaptests/steps/cloud/k8s_connectivity_info_create.py | 2 +- src/onaptests/steps/instantiate/k8s_profile_create.py | 2 +- src/onaptests/steps/instantiate/msb_k8s.py | 2 +- src/onaptests/steps/onboard/msb_k8s.py | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/requirements.txt b/requirements.txt index 77b1a6e..3ff4276 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,6 +2,6 @@ cryptography==38.0.4 xtesting==0.91.0 avionix>=0.4.5 openstacksdk>=0.61.0 -onapsdk==10.3.2 +onapsdk==10.4.1 jinja2>3 kubernetes>=22.6.0 diff --git a/src/onaptests/steps/cloud/k8s_connectivity_info_create.py b/src/onaptests/steps/cloud/k8s_connectivity_info_create.py index 6d0faf6..a492479 100644 --- a/src/onaptests/steps/cloud/k8s_connectivity_info_create.py +++ b/src/onaptests/steps/cloud/k8s_connectivity_info_create.py @@ -1,7 +1,7 @@ """Connectivity info creation module.""" from onapsdk.configuration import settings from onapsdk.exceptions import APIError -from onapsdk.msb.k8s import ConnectivityInfo +from onapsdk.k8s import ConnectivityInfo from ..base import BaseStep diff --git a/src/onaptests/steps/instantiate/k8s_profile_create.py b/src/onaptests/steps/instantiate/k8s_profile_create.py index a5c8552..f0ad61b 100644 --- a/src/onaptests/steps/instantiate/k8s_profile_create.py +++ b/src/onaptests/steps/instantiate/k8s_profile_create.py @@ -5,7 +5,7 @@ from yaml import load, SafeLoader from onapsdk.aai.business import Customer, ServiceInstance, ServiceSubscription from onapsdk.configuration import settings from onapsdk.exceptions import APIError, ResourceNotFound -from onapsdk.msb.k8s import Definition +from onapsdk.k8s import Definition from onapsdk.so.instantiation import InstantiationParameter import onaptests.utils.exceptions as onap_test_exceptions diff --git a/src/onaptests/steps/instantiate/msb_k8s.py b/src/onaptests/steps/instantiate/msb_k8s.py index 8f9ff2f..724549c 100644 --- a/src/onaptests/steps/instantiate/msb_k8s.py +++ b/src/onaptests/steps/instantiate/msb_k8s.py @@ -1,6 +1,6 @@ """MSB k8s instantiation module.""" from onapsdk.configuration import settings -from onapsdk.msb.k8s import Instance +from onapsdk.k8s import Instance from onaptests.steps.base import BaseStep from onaptests.steps.onboard.msb_k8s import CreateProfileStep diff --git a/src/onaptests/steps/onboard/msb_k8s.py b/src/onaptests/steps/onboard/msb_k8s.py index 503a886..3605c29 100644 --- a/src/onaptests/steps/onboard/msb_k8s.py +++ b/src/onaptests/steps/onboard/msb_k8s.py @@ -1,6 +1,6 @@ """MSB k8s plugin module.""" from onapsdk.configuration import settings -from onapsdk.msb.k8s import Definition, Profile +from onapsdk.k8s import Definition, Profile from onaptests.steps.base import BaseStep from onaptests.steps.cloud.cloud_region_create import CloudRegionCreateStep -- cgit 1.2.3-korg