diff options
Diffstat (limited to 'heat/vFW_CNF_CDS/automation/onboard.py')
| -rwxr-xr-x | heat/vFW_CNF_CDS/automation/onboard.py | 37 |
1 files changed, 27 insertions, 10 deletions
diff --git a/heat/vFW_CNF_CDS/automation/onboard.py b/heat/vFW_CNF_CDS/automation/onboard.py index c97b3510..0abd2660 100755 --- a/heat/vFW_CNF_CDS/automation/onboard.py +++ b/heat/vFW_CNF_CDS/automation/onboard.py @@ -1,5 +1,5 @@ # ============LICENSE_START======================================================= -# Copyright (C) 2020 Orange +# 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. @@ -24,7 +24,7 @@ from io import BytesIO import oyaml as yaml from config import Config -from onapsdk.sdc.properties import Property +import onapsdk.constants as const from onapsdk.sdc.vendor import Vendor from onapsdk.sdc.vsp import Vsp @@ -67,18 +67,35 @@ vsp = Vsp(name=Config.VSPNAME, vendor=vendor, package=open(myvspfile, 'rb')) vsp.onboard() logger.info("******** Onboard VF *******") -vf = Vf(name=Config.VFNAME, properties=[ - Property(name="sdnc_model_name", property_type="string", value=SDNC_MODEL_NAME), - Property(name="sdnc_model_version", property_type="string", value=SDNC_MODEL_VERSION), - Property(name="sdnc_artifact_name", property_type="string", value=Config.SDNC_ARTIFACT_NAME) -] - ) +vf = Vf(name=Config.VFNAME) vf.vsp = vsp +vf.create() vf.onboard() logger.info("******** Onboard Service *******") -svc = Service(name=Config.SERVICENAME, resources=[vf], instantiation_type=ServiceInstantiationType.MACRO) -svc.onboard() +svc = Service(name=Config.SERVICENAME, + instantiation_type=ServiceInstantiationType.MACRO) +svc.create() + +if svc.status == const.DRAFT: + svc.add_resource(vf) + + logger.info("******** Set SDNC properties for VF ********") + component = svc.get_component(vf) + prop = component.get_property("sdnc_model_version") + prop.value = SDNC_MODEL_VERSION + prop = component.get_property("sdnc_artifact_name") + prop.value = Config.SDNC_ARTIFACT_NAME + prop = component.get_property("sdnc_model_name") + prop.value = SDNC_MODEL_NAME + prop = component.get_property("controller_actor") + prop.value = "CDS" + prop = component.get_property("skip_post_instantiation_configuration") + prop.value = Config.SKIP_POST_INSTANTIATION + + logger.info("******** Onboard Service *******") + svc.checkin() + svc.onboard() logger.info("******** Check Service Distribution *******") distribution_completed = False |