# ============LICENSE_START=======================================================
# Copyright (C) 2021 Orange
# ============LICENSE_START=======================================================
# Copyright (C) 2021 Orange
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
ServiceInstantiation,
InstantiationParameter, VnfParameters, VfmoduleParameters)
from onapsdk.sdc.service import Service
ServiceInstantiation,
InstantiationParameter, VnfParameters, VfmoduleParameters)
from onapsdk.sdc.service import Service
from onapsdk.so.so_element import OrchestrationRequest
from onapsdk.aai.service_design_and_creation import Service as AaiService
from onapsdk.so.so_element import OrchestrationRequest
from onapsdk.aai.service_design_and_creation import Service as AaiService
- next(subscription for subscription in customer.service_subscriptions
- if subscription.service_type == service.name)
- except StopIteration:
+ customer.get_service_subscription_by_service_type(
+ service_type=service.name)
+ except ResourceNotFound:
def subscribe_service_customer(customer, service):
if not check_service_customer_subscription(customer, service):
logger.info("******** Subscribe Service *******")
def subscribe_service_customer(customer, service):
if not check_service_customer_subscription(customer, service):
logger.info("******** Subscribe Service *******")
-def add_business_objects(owning_entity, project, platform, line_of_business):
- vid_owning_entity = OwningEntity.create(Config.OWNING_ENTITY)
- vid_project = Project.create(project)
- vid_platform = Platform.create(platform)
- vid_line_of_business = LineOfBusiness.create(line_of_business)
- logger.info("******** Business objects added to VID *******")
-
+def add_owning_entity(owning_entity):
logger.info("******** Add Owning Entity to AAI *******")
try:
aai_owning_entity = AaiOwningEntity.get_by_owning_entity_name(owning_entity)
except ResourceNotFound:
logger.info("******** Owning Entity not existing: create *******")
logger.info("******** Add Owning Entity to AAI *******")
try:
aai_owning_entity = AaiOwningEntity.get_by_owning_entity_name(owning_entity)
except ResourceNotFound:
logger.info("******** Owning Entity not existing: create *******")
if vf_module_label == "base_template_dummy_ignore":
continue
if "k8s-rb-profile-name" not in Config.VF_MODULE_PARAM_LIST[vf_module_label]["instantiation_parameters"]:
continue
try:
definition = Definition.get_definition_by_name_version(
if vf_module_label == "base_template_dummy_ignore":
continue
if "k8s-rb-profile-name" not in Config.VF_MODULE_PARAM_LIST[vf_module_label]["instantiation_parameters"]:
continue
try:
definition = Definition.get_definition_by_name_version(
- rb_name=vf_module.metadata["vfModuleModelInvariantUUID"],
- rb_version=vf_module.metadata["vfModuleModelCustomizationUUID"])
+ rb_name=vf_module.model_invariant_uuid,
+ rb_version=vf_module.model_customization_id)
- rb_name=vf_module.metadata["vfModuleModelInvariantUUID"],
- rb_version=vf_module.metadata["vfModuleModelUUID"])
+ rb_name=vf_module.model_invariant_uuid,
+ rb_version=vf_module.model_version_id)
def instantiate_service_macro(service_instance_name,
sdnc_model_name, sdnc_model_version, sdnc_artifact_name, vf_name, vnf_param_list,
vf_module_list, service, cloud_region, tenant, customer, owning_entity,
def instantiate_service_macro(service_instance_name,
sdnc_model_name, sdnc_model_version, sdnc_artifact_name, vf_name, vnf_param_list,
vf_module_list, service, cloud_region, tenant, customer, owning_entity,
- vid_project, vid_line_of_business, vid_platform):
+ vid_project, vid_line_of_business, vid_platform, service_subscription):
# TODO: support for multiple vnf should be added BEGINING of the loop
vnf_parameters = get_vnf_parameters(sdnc_model_name, sdnc_model_version, sdnc_artifact_name, vnf_param_list)
# TODO: support for multiple vnf should be added BEGINING of the loop
vnf_parameters = get_vnf_parameters(sdnc_model_name, sdnc_model_version, sdnc_artifact_name, vnf_param_list)
platform=vid_platform,
service_instance_name=service_instance_name,
vnf_parameters=[vnf_instantiation_parameters],
platform=vid_platform,
service_instance_name=service_instance_name,
vnf_parameters=[vnf_instantiation_parameters],
- logger.info("******** Add Business Objects (OE, P, Pl, LoB) *******")
- vid_project, vid_platform, vid_line_of_business, owning_entity = add_business_objects(Config.OWNING_ENTITY,
- Config.PROJECT,
- Config.PLATFORM,
- Config.LINE_OF_BUSINESS)
+ logger.info("******** Business Objects (OE, P, Pl, LoB) *******")
+ project = Config.PROJECT
+ platform = Config.PLATFORM
+ line_of_business = Config.LINE_OF_BUSINESS
+ owning_entity = add_owning_entity(Config.OWNING_ENTITY)
sdnc_model_version, Config.SDNC_ARTIFACT_NAME, Config.VFNAME,
Config.VNF_PARAM_LIST,
Config.VF_MODULE_PARAM_LIST,
sdnc_model_version, Config.SDNC_ARTIFACT_NAME, Config.VFNAME,
Config.VNF_PARAM_LIST,
Config.VF_MODULE_PARAM_LIST,
- service, cloud_region, tenant, customer, owning_entity, vid_project,
- vid_line_of_business, vid_platform)
+ service, cloud_region, tenant, customer, owning_entity, project,
+ line_of_business, platform, service_subscription)
else:
instantiate_service_alacarte(service_subscription, Config.SERVICE_INSTANCE_NAME, sdnc_model_name,
sdnc_model_version, Config.SDNC_ARTIFACT_NAME, Config.VNF_PARAM_LIST,
Config.VF_MODULE_PARAM_LIST,
else:
instantiate_service_alacarte(service_subscription, Config.SERVICE_INSTANCE_NAME, sdnc_model_name,
sdnc_model_version, Config.SDNC_ARTIFACT_NAME, Config.VNF_PARAM_LIST,
Config.VF_MODULE_PARAM_LIST,
- service, cloud_region, tenant, customer, owning_entity, vid_project,
- vid_line_of_business, vid_platform)
+ service, cloud_region, tenant, customer, owning_entity, project,
+ line_of_business, platform)