diff options
Diffstat (limited to 'src/onaptests/steps/instantiate')
7 files changed, 24 insertions, 23 deletions
diff --git a/src/onaptests/steps/instantiate/k8s_profile_create.py b/src/onaptests/steps/instantiate/k8s_profile_create.py index 4be5684..9630ec4 100644 --- a/src/onaptests/steps/instantiate/k8s_profile_create.py +++ b/src/onaptests/steps/instantiate/k8s_profile_create.py @@ -1,14 +1,15 @@ from typing import Iterable from uuid import uuid4 -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.k8s import Definition from onapsdk.so.instantiation import InstantiationParameter +from yaml import SafeLoader, load import onaptests.utils.exceptions as onap_test_exceptions + from ..base import BaseStep from .vnf_ala_carte import YamlTemplateVnfAlaCarteInstantiateStep diff --git a/src/onaptests/steps/instantiate/sdnc_service.py b/src/onaptests/steps/instantiate/sdnc_service.py index 851902a..7b8c600 100644 --- a/src/onaptests/steps/instantiate/sdnc_service.py +++ b/src/onaptests/steps/instantiate/sdnc_service.py @@ -5,6 +5,7 @@ from onapsdk.exceptions import APIError from onapsdk.sdnc import VfModulePreload from onapsdk.sdnc.preload import PreloadInformation from onapsdk.sdnc.services import Service + from onaptests.scenario.scenario_base import BaseScenarioStep from onaptests.steps.base import BaseStep from onaptests.utils.exceptions import OnapTestException diff --git a/src/onaptests/steps/instantiate/service_ala_carte.py b/src/onaptests/steps/instantiate/service_ala_carte.py index 4a0a4c1..84be750 100644 --- a/src/onaptests/steps/instantiate/service_ala_carte.py +++ b/src/onaptests/steps/instantiate/service_ala_carte.py @@ -1,17 +1,19 @@ import time from uuid import uuid4 -from yaml import load, SafeLoader -from onapsdk.aai.cloud_infrastructure import CloudRegion, Tenant from onapsdk.aai.business.owning_entity import OwningEntity as AaiOwningEntity +from onapsdk.aai.cloud_infrastructure import CloudRegion, Tenant from onapsdk.configuration import settings from onapsdk.exceptions import ResourceNotFound from onapsdk.sdc.service import Service from onapsdk.so.instantiation import ServiceInstantiation +from yaml import SafeLoader, load import onaptests.utils.exceptions as onap_test_exceptions + from ..base import YamlTemplateBaseStep -from ..cloud.connect_service_subscription_to_cloud_region import ConnectServiceSubToCloudRegionStep +from ..cloud.connect_service_subscription_to_cloud_region import \ + ConnectServiceSubToCloudRegionStep from ..onboard.service import YamlTemplateServiceOnboardStep diff --git a/src/onaptests/steps/instantiate/service_macro.py b/src/onaptests/steps/instantiate/service_macro.py index a513d1e..37c5318 100644 --- a/src/onaptests/steps/instantiate/service_macro.py +++ b/src/onaptests/steps/instantiate/service_macro.py @@ -2,7 +2,6 @@ import time from typing import List from uuid import uuid4 -from yaml import load, SafeLoader from onapsdk.aai.business.owning_entity import OwningEntity from onapsdk.aai.cloud_infrastructure.cloud_region import CloudRegion @@ -10,23 +9,18 @@ from onapsdk.aai.cloud_infrastructure.tenant import Tenant from onapsdk.configuration import settings from onapsdk.exceptions import ResourceNotFound from onapsdk.sdc.service import Service -from onapsdk.so.instantiation import ( - InstantiationParameter, - ServiceInstantiation, - VfmoduleParameters, - VnfParameters, - SoService -) -from onaptests.steps.cloud.customer_service_subscription_create import ( - CustomerServiceSubscriptionCreateStep -) +from onapsdk.so.instantiation import (InstantiationParameter, + ServiceInstantiation, SoService, + VfmoduleParameters, VnfParameters) +from yaml import SafeLoader, load import onaptests.utils.exceptions as onap_test_exceptions from onaptests.steps.base import YamlTemplateBaseStep -from onaptests.steps.onboard.service import YamlTemplateServiceOnboardStep -from onaptests.steps.cloud.connect_service_subscription_to_cloud_region import ( +from onaptests.steps.cloud.connect_service_subscription_to_cloud_region import \ ConnectServiceSubToCloudRegionStep -) +from onaptests.steps.cloud.customer_service_subscription_create import \ + CustomerServiceSubscriptionCreateStep +from onaptests.steps.onboard.service import YamlTemplateServiceOnboardStep class YamlTemplateServiceMacroInstantiateStep(YamlTemplateBaseStep): diff --git a/src/onaptests/steps/instantiate/vf_module_ala_carte.py b/src/onaptests/steps/instantiate/vf_module_ala_carte.py index e148e4c..e6fc32b 100644 --- a/src/onaptests/steps/instantiate/vf_module_ala_carte.py +++ b/src/onaptests/steps/instantiate/vf_module_ala_carte.py @@ -1,15 +1,16 @@ from typing import Iterable from uuid import uuid4 -from yaml import load, SafeLoader from onapsdk.aai.cloud_infrastructure import CloudRegion, Tenant from onapsdk.configuration import settings from onapsdk.so.instantiation import InstantiationParameter +from yaml import SafeLoader, load import onaptests.utils.exceptions as onap_test_exceptions + from ..base import YamlTemplateBaseStep -from .vnf_ala_carte import YamlTemplateVnfAlaCarteInstantiateStep from .k8s_profile_create import K8SProfileStep +from .vnf_ala_carte import YamlTemplateVnfAlaCarteInstantiateStep class YamlTemplateVfModuleAlaCarteInstantiateStep(YamlTemplateBaseStep): diff --git a/src/onaptests/steps/instantiate/vl_ala_carte.py b/src/onaptests/steps/instantiate/vl_ala_carte.py index 72dcb2f..2d974b4 100644 --- a/src/onaptests/steps/instantiate/vl_ala_carte.py +++ b/src/onaptests/steps/instantiate/vl_ala_carte.py @@ -1,13 +1,14 @@ import re from typing import Iterable from uuid import uuid4 -from yaml import load, SafeLoader from onapsdk.configuration import settings -from onapsdk.so.instantiation import Subnet from onapsdk.sdc.service import Service +from onapsdk.so.instantiation import Subnet +from yaml import SafeLoader, load import onaptests.utils.exceptions as onap_test_exceptions + from ..base import YamlTemplateBaseStep from .service_ala_carte import YamlTemplateServiceAlaCarteInstantiateStep diff --git a/src/onaptests/steps/instantiate/vnf_ala_carte.py b/src/onaptests/steps/instantiate/vnf_ala_carte.py index e45f71e..8ead082 100644 --- a/src/onaptests/steps/instantiate/vnf_ala_carte.py +++ b/src/onaptests/steps/instantiate/vnf_ala_carte.py @@ -1,11 +1,12 @@ from uuid import uuid4 -from yaml import load, SafeLoader from onapsdk.aai.cloud_infrastructure import CloudRegion, Tenant from onapsdk.configuration import settings from onapsdk.sdc.service import Service +from yaml import SafeLoader, load import onaptests.utils.exceptions as onap_test_exceptions + from ..base import YamlTemplateBaseStep from .service_ala_carte import YamlTemplateServiceAlaCarteInstantiateStep |