diff options
Diffstat (limited to 'onap-client/onap_client/so')
5 files changed, 37 insertions, 10 deletions
diff --git a/onap-client/onap_client/so/service_instance.py b/onap-client/onap_client/so/service_instance.py index 2b1774d..23d2b24 100644 --- a/onap-client/onap_client/so/service_instance.py +++ b/onap-client/onap_client/so/service_instance.py @@ -85,12 +85,7 @@ class ServiceInstance(Resource): instance_input["tenant_id"] = tenant_id instance_input["customer_id"] = instance_input.get("customer_name") - service_model = self.oc.sdc.service.get_sdc_service( - catalog_service_id=sdc.service.get_service_id( - instance_input.get("model_name"), - oc=self.oc - ) - ).response_data + service_model = sdc.service.get_service(instance_input.get("model_name"), oc=self.oc) instance_input["model_invariant_id"] = service_model["invariantUUID"] instance_input["model_version_id"] = service_model["uniqueId"] diff --git a/onap-client/onap_client/so/tests/test_module_instance.py b/onap-client/onap_client/so/tests/test_module_instance.py index 0e8c655..8ec8a59 100644 --- a/onap-client/onap_client/so/tests/test_module_instance.py +++ b/onap-client/onap_client/so/tests/test_module_instance.py @@ -139,6 +139,18 @@ def test_module_instance(): } ) mockup_catalog_item( + oc.sdc.service.catalog_items["GET_SERVICE_BY_NAME_VERSION"], + override_uri_params={"catalog_service_name": SERVICE_MODEL_NAME, "catalog_service_version": "1.0"}, + override_return_data={ + "uniqueId": SERVICE_MODEL_ID, + "allVersions": { + "1.0": "badid", + "2.0": SERVICE_MODEL_ID + }, + "name": SERVICE_MODEL_NAME, + } + ) + mockup_catalog_item( oc.sdc.vnf.catalog_items["GET_CATALOG_RESOURCE"], override_return_data={ "invariantUUID": VNF_INVARIANT_ID diff --git a/onap-client/onap_client/so/tests/test_service_instance.py b/onap-client/onap_client/so/tests/test_service_instance.py index b215fbf..fed5ac9 100644 --- a/onap-client/onap_client/so/tests/test_service_instance.py +++ b/onap-client/onap_client/so/tests/test_service_instance.py @@ -69,9 +69,9 @@ def test_service_instance(): }, ) mockup_catalog_item( - oc.sdc.service.catalog_items["GET_SDC_SERVICE"], - override_uri_params={"catalog_service_id": SERVICE_MODEL_ID}, - override_return_data={"invariantUUID": SERVICE_MODEL_INVARIANT_ID, "uniqueId": SERVICE_MODEL_ID} + oc.sdc.service.catalog_items["GET_SERVICE_BY_NAME_VERSION"], + override_uri_params={"catalog_service_name": SERVICE_MODEL_NAME, "catalog_service_version": "1.0"}, + override_return_data={"invariantUUID": SERVICE_MODEL_INVARIANT_ID, "uniqueId": SERVICE_MODEL_ID, "allVersions": {"1.0": SERVICE_MODEL_ID}} ) mockup_catalog_item( oc.aai.cloud_infrastructure.catalog_items["GET_CLOUD_REGION_TENANTS"], diff --git a/onap-client/onap_client/so/tests/test_vnf_instance.py b/onap-client/onap_client/so/tests/test_vnf_instance.py index 88334b0..9f03cca 100644 --- a/onap-client/onap_client/so/tests/test_vnf_instance.py +++ b/onap-client/onap_client/so/tests/test_vnf_instance.py @@ -90,6 +90,20 @@ def test_vnf_instance(): ], } ) + + mockup_catalog_item( + oc.sdc.service.catalog_items["GET_SERVICE_BY_NAME_VERSION"], + override_uri_params={"catalog_service_name": SERVICE_MODEL_NAME, "catalog_service_version": "1.0"}, + override_return_data={ + "uniqueId": SERVICE_MODEL_ID, + "allVersions": { + "1.0": "badid", + "2.0": SERVICE_MODEL_ID + }, + "name": SERVICE_MODEL_NAME, + } + ) + mockup_catalog_item( oc.sdc.service.catalog_items["GET_SDC_SERVICE"], override_uri_params={"catalog_service_id": SERVICE_MODEL_ID}, @@ -106,6 +120,7 @@ def test_vnf_instance(): ] } ) + mockup_catalog_item( oc.sdc.vnf.catalog_items["GET_CATALOG_RESOURCE"], override_return_data={ @@ -113,6 +128,7 @@ def test_vnf_instance(): }, override_uri_params={"catalog_resource_id": VNF_ACTUAL_UUID}, ) + mockup_catalog_item( oc.sdnc.configuration.catalog_items["GET_SERVICE_INSTANCES"], override_return_data={ @@ -138,6 +154,7 @@ def test_vnf_instance(): } }, ) + mockup_catalog_item( oc.so.service_instantiation.catalog_items["CREATE_VNF_INSTANCE"], override_return_data={ @@ -146,6 +163,7 @@ def test_vnf_instance(): } } ) + mockup_catalog_item( oc.so.service_instantiation.catalog_items["GET_REQUEST_STATUS"], override_uri_params={"request_id": REQUEST_ID}, diff --git a/onap-client/onap_client/so/vnf_instance.py b/onap-client/onap_client/so/vnf_instance.py index 32fcda7..44d84e9 100644 --- a/onap-client/onap_client/so/vnf_instance.py +++ b/onap-client/onap_client/so/vnf_instance.py @@ -134,8 +134,10 @@ def get_vnf_model_component(service_model_name, vnf_model_name, oc=None): if not oc: oc = Client() + catalog_service_id, catalog_service = sdc.service.get_service_id(service_model_name, oc=oc) + service_model = oc.sdc.service.get_sdc_service( - catalog_service_id=sdc.service.get_service_id(service_model_name, oc=oc) + catalog_service_id=catalog_service_id ).response_data for component in service_model.get("componentInstances", []): |