diff options
Diffstat (limited to 'onap-client/onap_client/sdc/catalog')
4 files changed, 95 insertions, 115 deletions
diff --git a/onap-client/onap_client/sdc/catalog/license_model_catalog.py b/onap-client/onap_client/sdc/catalog/license_model_catalog.py index a01b967..0a90ebf 100644 --- a/onap-client/onap_client/sdc/catalog/license_model_catalog.py +++ b/onap-client/onap_client/sdc/catalog/license_model_catalog.py @@ -34,16 +34,11 @@ # limitations under the License. # # ============LICENSE_END============================================ - import uuid from functools import partial -from onap_client import config from onap_client.sdc.client import SDCClient -PAYLOADS_DIR = config.PAYLOADS_DIR -application_id = config.APPLICATION_ID - class LicenseModelClient(SDCClient): @property @@ -61,7 +56,7 @@ class LicenseModelClient(SDCClient): endpoint=self.config.sdc.SDC_BE_ONBOARD_ENDPOINT, service_path=self.config.sdc.SDC_VENDOR_LICENSE_MODEL_PATH, ), - "payload": "{}/license_model.jinja".format(PAYLOADS_DIR), + "payload": "{}/license_model.jinja".format(self.config.payload_directory), "payload-parameters": ["vendor_name"], "success_code": 200, "headers": { @@ -69,7 +64,7 @@ class LicenseModelClient(SDCClient): "Content-Type": "application/json", "USER_ID": self.sdc_designer_user_id, "X-TransactionId": str(uuid.uuid4()), - "X-FromAppId": application_id, + "X-FromAppId": self.config.application_id, }, "return_data": { "license_model_id": ("itemId",), @@ -89,7 +84,7 @@ class LicenseModelClient(SDCClient): service_path=self.config.sdc.SDC_VENDOR_LICENSE_MODEL_PATH, ), "uri-parameters": ["license_model_id", "license_model_version_id"], - "payload": "{}/key_group.jinja".format(PAYLOADS_DIR), + "payload": "{}/key_group.jinja".format(self.config.payload_directory), "payload-parameters": [ "license_start_date", "license_end_date", @@ -101,7 +96,7 @@ class LicenseModelClient(SDCClient): "Content-Type": "application/json", "USER_ID": self.sdc_designer_user_id, "X-TransactionId": str(uuid.uuid4()), - "X-FromAppId": application_id, + "X-FromAppId": self.config.application_id, }, "return_data": {"key_group_id": ("value",)}, "auth": ( @@ -118,7 +113,7 @@ class LicenseModelClient(SDCClient): service_path=self.config.sdc.SDC_VENDOR_LICENSE_MODEL_PATH, ), "uri-parameters": ["license_model_id", "license_model_version_id"], - "payload": "{}/entitlement_pool.jinja".format(PAYLOADS_DIR), + "payload": "{}/entitlement_pool.jinja".format(self.config.payload_directory), "payload-parameters": [ "license_start_date", "license_end_date", @@ -130,7 +125,7 @@ class LicenseModelClient(SDCClient): "Content-Type": "application/json", "USER_ID": self.sdc_designer_user_id, "X-TransactionId": str(uuid.uuid4()), - "X-FromAppId": application_id, + "X-FromAppId": self.config.application_id, }, "return_data": {"entitlement_pool_id": ("value",)}, "auth": ( @@ -147,7 +142,7 @@ class LicenseModelClient(SDCClient): service_path=self.config.sdc.SDC_VENDOR_LICENSE_MODEL_PATH, ), "uri-parameters": ["license_model_id", "license_model_version_id"], - "payload": "{}/feature_group.jinja".format(PAYLOADS_DIR), + "payload": "{}/feature_group.jinja".format(self.config.payload_directory), "payload-parameters": [ "feature_group_name", "key_group_id", @@ -160,7 +155,7 @@ class LicenseModelClient(SDCClient): "Content-Type": "application/json", "USER_ID": self.sdc_designer_user_id, "X-TransactionId": str(uuid.uuid4()), - "X-FromAppId": application_id, + "X-FromAppId": self.config.application_id, }, "return_data": {"feature_group_id": ("value",)}, "auth": ( @@ -177,7 +172,7 @@ class LicenseModelClient(SDCClient): service_path=self.config.sdc.SDC_VENDOR_LICENSE_MODEL_PATH, ), "uri-parameters": ["license_model_id", "license_model_version_id"], - "payload": "{}/license_agreement.jinja".format(PAYLOADS_DIR), + "payload": "{}/license_agreement.jinja".format(self.config.payload_directory), "payload-parameters": ["feature_group_id", "license_agreement_name"], "success_code": 200, "headers": { @@ -185,7 +180,7 @@ class LicenseModelClient(SDCClient): "Content-Type": "application/json", "USER_ID": self.sdc_designer_user_id, "X-TransactionId": str(uuid.uuid4()), - "X-FromAppId": application_id, + "X-FromAppId": self.config.application_id, }, "return_data": {"license_agreement_id": ("value",)}, "auth": ( @@ -202,7 +197,7 @@ class LicenseModelClient(SDCClient): service_path=self.config.sdc.SDC_VENDOR_LICENSE_MODEL_PATH, ), "uri-parameters": ["license_model_id", "license_model_version_id"], - "payload": "{}/action.jinja".format(PAYLOADS_DIR), + "payload": "{}/action.jinja".format(self.config.payload_directory), "payload-parameters": ["action"], "success_code": 200, "headers": { @@ -210,7 +205,7 @@ class LicenseModelClient(SDCClient): "Content-Type": "application/json", "USER_ID": self.sdc_designer_user_id, "X-TransactionId": str(uuid.uuid4()), - "X-FromAppId": application_id, + "X-FromAppId": self.config.application_id, }, "auth": ( self.global_sdc_username, @@ -232,7 +227,7 @@ class LicenseModelClient(SDCClient): "Content-Type": "application/json", "USER_ID": self.sdc_designer_user_id, "X-TransactionId": str(uuid.uuid4()), - "X-FromAppId": application_id, + "X-FromAppId": self.config.application_id, }, "return_data": { "vendor_name": ("vendorName",), @@ -259,7 +254,7 @@ class LicenseModelClient(SDCClient): "Content-Type": "application/json", "USER_ID": self.sdc_designer_user_id, "X-TransactionId": str(uuid.uuid4()), - "X-FromAppId": application_id, + "X-FromAppId": self.config.application_id, }, "auth": ( self.global_sdc_username, @@ -281,7 +276,7 @@ class LicenseModelClient(SDCClient): "Content-Type": "application/json", "USER_ID": self.sdc_designer_user_id, "X-TransactionId": str(uuid.uuid4()), - "X-FromAppId": application_id, + "X-FromAppId": self.config.application_id, }, "auth": ( self.global_sdc_username, @@ -302,7 +297,7 @@ class LicenseModelClient(SDCClient): "Content-Type": "application/json", "USER_ID": self.sdc_designer_user_id, "X-TransactionId": str(uuid.uuid4()), - "X-FromAppId": application_id, + "X-FromAppId": self.config.application_id, }, "return_data": {"results": ("results",)}, "auth": ( diff --git a/onap-client/onap_client/sdc/catalog/service_catalog.py b/onap-client/onap_client/sdc/catalog/service_catalog.py index aad645f..dad8456 100644 --- a/onap-client/onap_client/sdc/catalog/service_catalog.py +++ b/onap-client/onap_client/sdc/catalog/service_catalog.py @@ -34,16 +34,11 @@ # limitations under the License. # # ============LICENSE_END============================================ - import uuid from functools import partial -from onap_client import config from onap_client.sdc.client import SDCClient -PAYLOADS_DIR = config.PAYLOADS_DIR -application_id = config.APPLICATION_ID - class ServiceCatalog(SDCClient): @property @@ -61,7 +56,7 @@ class ServiceCatalog(SDCClient): endpoint=self.config.sdc.SDC_BE_ENDPOINT, service_path=self.config.sdc.SDC_CATALOG_SERVICES_PATH, ), - "payload": "{}/catalog_service.jinja".format(PAYLOADS_DIR), + "payload": "{}/catalog_service.jinja".format(self.config.payload_directory), "payload-parameters": [ "service_name", "instantiation_type", @@ -85,7 +80,7 @@ class ServiceCatalog(SDCClient): "Content-Type": "application/json", "USER_ID": self.sdc_designer_user_id, "X-TransactionId": str(uuid.uuid4()), - "X-FromAppId": application_id, + "X-FromAppId": self.config.application_id, }, "return_data": {"catalog_service_id": ("uniqueId",)}, "auth": ( @@ -108,7 +103,7 @@ class ServiceCatalog(SDCClient): "Content-Type": "application/json", "USER_ID": self.sdc_designer_user_id, "X-TransactionId": str(uuid.uuid4()), - "X-FromAppId": application_id, + "X-FromAppId": self.config.application_id, }, "return_data": {"catalog_service_id": ("uniqueId",)}, "auth": ( @@ -125,7 +120,7 @@ class ServiceCatalog(SDCClient): service_path=self.config.sdc.SDC_CATALOG_SERVICES_PATH, ), "uri-parameters": ["catalog_service_id"], - "payload": "{}/resource_instance.jinja".format(PAYLOADS_DIR), + "payload": "{}/resource_instance.jinja".format(self.config.payload_directory), "payload-parameters": [ "milli_timestamp", "catalog_resource_id", @@ -140,7 +135,7 @@ class ServiceCatalog(SDCClient): "Content-Type": "application/json", "USER_ID": self.sdc_designer_user_id, "X-TransactionId": str(uuid.uuid4()), - "X-FromAppId": application_id, + "X-FromAppId": self.config.application_id, }, "return_data": {"catalog_resource_instance_id": ("uniqueId",)}, "auth": ( @@ -163,7 +158,7 @@ class ServiceCatalog(SDCClient): "Content-Type": "application/json", "USER_ID": self.sdc_designer_user_id, "X-TransactionId": str(uuid.uuid4()), - "X-FromAppId": application_id, + "X-FromAppId": self.config.application_id, }, "auth": ( self.global_sdc_username, @@ -179,7 +174,7 @@ class ServiceCatalog(SDCClient): service_path=self.config.sdc.SDC_CATALOG_SERVICES_PATH, ), "uri-parameters": ["catalog_service_id", "component_name"], - "payload": "{}/update_resource_instance.jinja".format(PAYLOADS_DIR), + "payload": "{}/update_resource_instance.jinja".format(self.config.payload_directory), "payload-parameters": [ "component_id", ], @@ -189,7 +184,7 @@ class ServiceCatalog(SDCClient): "Content-Type": "application/json", "USER_ID": self.sdc_designer_user_id, "X-TransactionId": str(uuid.uuid4()), - "X-FromAppId": application_id, + "X-FromAppId": self.config.application_id, }, "auth": ( self.global_sdc_username, @@ -205,7 +200,7 @@ class ServiceCatalog(SDCClient): service_path=self.config.sdc.SDC_CATALOG_SERVICES_PATH, ), "uri-parameters": ["catalog_service_id"], - "payload": "{}/user_remarks.jinja".format(PAYLOADS_DIR), + "payload": "{}/user_remarks.jinja".format(self.config.payload_directory), "payload-parameters": ["user_remarks"], "success_code": 200, "headers": { @@ -213,7 +208,7 @@ class ServiceCatalog(SDCClient): "Content-Type": "application/json", "USER_ID": self.sdc_designer_user_id, "X-TransactionId": str(uuid.uuid4()), - "X-FromAppId": application_id, + "X-FromAppId": self.config.application_id, }, "auth": ( self.global_sdc_username, @@ -229,7 +224,7 @@ class ServiceCatalog(SDCClient): service_path=self.config.sdc.SDC_CATALOG_SERVICES_PATH, ), "uri-parameters": ["catalog_service_id"], - "payload": "{}/user_remarks.jinja".format(PAYLOADS_DIR), + "payload": "{}/user_remarks.jinja".format(self.config.payload_directory), "payload-parameters": ["user_remarks"], "success_code": 200, "headers": { @@ -237,7 +232,7 @@ class ServiceCatalog(SDCClient): "Content-Type": "application/json", "USER_ID": self.sdc_designer_user_id, "X-TransactionId": str(uuid.uuid4()), - "X-FromAppId": application_id, + "X-FromAppId": self.config.application_id, }, "auth": ( self.global_sdc_username, @@ -253,7 +248,7 @@ class ServiceCatalog(SDCClient): service_path=self.config.sdc.SDC_CATALOG_SERVICES_PATH, ), "uri-parameters": ["catalog_service_id"], - "payload": "{}/user_remarks.jinja".format(PAYLOADS_DIR), + "payload": "{}/user_remarks.jinja".format(self.config.payload_directory), "payload-parameters": ["user_remarks"], "success_code": 200, "headers": { @@ -261,7 +256,7 @@ class ServiceCatalog(SDCClient): "Content-Type": "application/json", "USER_ID": self.sdc_tester_user_id, "X-TransactionId": str(uuid.uuid4()), - "X-FromAppId": application_id, + "X-FromAppId": self.config.application_id, }, "auth": ( self.global_sdc_username, @@ -277,7 +272,7 @@ class ServiceCatalog(SDCClient): service_path=self.config.sdc.SDC_CATALOG_SERVICES_PATH, ), "uri-parameters": ["catalog_service_id"], - "payload": "{}/user_remarks.jinja".format(PAYLOADS_DIR), + "payload": "{}/user_remarks.jinja".format(self.config.payload_directory), "payload-parameters": ["user_remarks"], "success_code": 200, "headers": { @@ -285,7 +280,7 @@ class ServiceCatalog(SDCClient): "Content-Type": "application/json", "USER_ID": self.sdc_tester_user_id, "X-TransactionId": str(uuid.uuid4()), - "X-FromAppId": application_id, + "X-FromAppId": self.config.application_id, }, "return_data": {"catalog_service_id": ("uniqueId",)}, "auth": ( @@ -302,7 +297,7 @@ class ServiceCatalog(SDCClient): service_path=self.config.sdc.SDC_CATALOG_SERVICES_PATH, ), "uri-parameters": ["catalog_service_id"], - "payload": "{}/user_remarks.jinja".format(PAYLOADS_DIR), + "payload": "{}/user_remarks.jinja".format(self.config.payload_directory), "payload-parameters": ["user_remarks"], "success_code": 200, "headers": { @@ -310,7 +305,7 @@ class ServiceCatalog(SDCClient): "Content-Type": "application/json", "USER_ID": self.sdc_governor_user_id, "X-TransactionId": str(uuid.uuid4()), - "X-FromAppId": application_id, + "X-FromAppId": self.config.application_id, }, "auth": ( self.global_sdc_username, @@ -333,7 +328,7 @@ class ServiceCatalog(SDCClient): "Content-Type": "application/json", "USER_ID": self.sdc_ops_user_id, # "X-TransactionId": str(uuid.uuid4()), - "X-FromAppId": application_id, + "X-FromAppId": self.config.application_id, }, "auth": ( self.global_sdc_username, @@ -349,7 +344,7 @@ class ServiceCatalog(SDCClient): service_path=self.config.sdc.SDC_CATALOG_RESOURCES_PATH, ), "uri-parameters": ["catalog_service_id", "catalog_resource_instance_id"], - "payload": "{}/catalog_service_property.jinja".format(PAYLOADS_DIR), + "payload": "{}/catalog_service_property.jinja".format(self.config.payload_directory), "payload-parameters": [ "unique_id", "parent_unique_id", @@ -365,7 +360,7 @@ class ServiceCatalog(SDCClient): "Content-Type": "application/json", "USER_ID": self.sdc_designer_user_id, "X-TransactionId": str(uuid.uuid4()), - "X-FromAppId": application_id, + "X-FromAppId": self.config.application_id, }, "auth": ( self.global_sdc_username, @@ -381,7 +376,7 @@ class ServiceCatalog(SDCClient): service_path=self.config.sdc.SDC_CATALOG_RESOURCES_PATH, ), "uri-parameters": ["catalog_service_id", "catalog_resource_instance_id"], - "payload": "{}/catalog_service_property.jinja".format(PAYLOADS_DIR), + "payload": "{}/catalog_service_property.jinja".format(self.config.payload_directory), "payload-parameters": [ "unique_id", "parent_unique_id", @@ -395,7 +390,7 @@ class ServiceCatalog(SDCClient): "Content-Type": "application/json", "USER_ID": self.sdc_designer_user_id, "X-TransactionId": str(uuid.uuid4()), - "X-FromAppId": application_id, + "X-FromAppId": self.config.application_id, }, "auth": ( self.global_sdc_username, @@ -411,7 +406,7 @@ class ServiceCatalog(SDCClient): service_path=self.config.sdc.SDC_CATALOG_RESOURCES_PATH, ), "uri-parameters": ["catalog_service_id", "catalog_resource_instance_id", "module_id"], - "payload": "{}/generic_payload.jinja".format(PAYLOADS_DIR), + "payload": "{}/generic_payload.jinja".format(self.config.payload_directory), "payload-parameters": [ "payload_data", ], @@ -421,7 +416,7 @@ class ServiceCatalog(SDCClient): "Content-Type": "application/json", "USER_ID": self.sdc_designer_user_id, "X-TransactionId": str(uuid.uuid4()), - "X-FromAppId": application_id, + "X-FromAppId": self.config.application_id, }, "auth": ( self.global_sdc_username, @@ -443,7 +438,7 @@ class ServiceCatalog(SDCClient): "Content-Type": "application/json", "USER_ID": self.sdc_designer_user_id, "X-TransactionId": str(uuid.uuid4()), - "X-FromAppId": application_id, + "X-FromAppId": self.config.application_id, }, "auth": ( self.global_sdc_username, @@ -464,7 +459,7 @@ class ServiceCatalog(SDCClient): "Content-Type": "application/json", "USER_ID": self.sdc_designer_user_id, "X-TransactionId": str(uuid.uuid4()), - "X-FromAppId": application_id, + "X-FromAppId": self.config.application_id, }, "return_data": {"services": ("services",)}, "auth": ( @@ -487,7 +482,7 @@ class ServiceCatalog(SDCClient): "Content-Type": "application/json", "USER_ID": self.sdc_designer_user_id, "X-TransactionId": str(uuid.uuid4()), - "X-FromAppId": application_id, + "X-FromAppId": self.config.application_id, }, "auth": ( self.global_sdc_username, @@ -509,7 +504,7 @@ class ServiceCatalog(SDCClient): "Content-Type": "application/json", "USER_ID": self.sdc_designer_user_id, "X-TransactionId": str(uuid.uuid4()), - "X-FromAppId": application_id, + "X-FromAppId": self.config.application_id, }, "auth": ( self.global_sdc_username, @@ -531,7 +526,7 @@ class ServiceCatalog(SDCClient): "Content-Type": "application/json", "USER_ID": self.sdc_designer_user_id, "X-TransactionId": str(uuid.uuid4()), - "X-FromAppId": application_id, + "X-FromAppId": self.config.application_id, }, "auth": ( self.global_sdc_username, diff --git a/onap-client/onap_client/sdc/catalog/vnf_catalog.py b/onap-client/onap_client/sdc/catalog/vnf_catalog.py index 692052f..71b20ca 100644 --- a/onap-client/onap_client/sdc/catalog/vnf_catalog.py +++ b/onap-client/onap_client/sdc/catalog/vnf_catalog.py @@ -34,16 +34,11 @@ # limitations under the License. # # ============LICENSE_END============================================ - import uuid from functools import partial -from onap_client import config from onap_client.sdc.client import SDCClient -PAYLOADS_DIR = config.PAYLOADS_DIR -application_id = config.APPLICATION_ID - class VNFCatalog(SDCClient): @property @@ -61,7 +56,7 @@ class VNFCatalog(SDCClient): endpoint=self.config.sdc.SDC_BE_ENDPOINT, service_path=self.config.sdc.SDC_CATALOG_RESOURCES_PATH, ), - "payload": "{}/catalog_resource.jinja".format(PAYLOADS_DIR), + "payload": "{}/catalog_resource.jinja".format(self.config.payload_directory), "payload-parameters": [ "software_product_id", "vnf_name", @@ -77,7 +72,7 @@ class VNFCatalog(SDCClient): "Content-Type": "application/json", "USER_ID": self.sdc_designer_user_id, "X-TransactionId": str(uuid.uuid4()), - "X-FromAppId": application_id, + "X-FromAppId": self.config.application_id, }, "return_data": {"catalog_resource_id": ("uniqueId",)}, "auth": ( @@ -94,7 +89,7 @@ class VNFCatalog(SDCClient): service_path=self.config.sdc.SDC_CATALOG_RESOURCES_PATH, ), "uri-parameters": ["catalog_resource_id"], - "payload": "{}/user_remarks.jinja".format(PAYLOADS_DIR), + "payload": "{}/user_remarks.jinja".format(self.config.payload_directory), "payload-parameters": ["user_remarks"], "success_code": 200, "headers": { @@ -102,7 +97,7 @@ class VNFCatalog(SDCClient): "Content-Type": "application/json", "USER_ID": self.sdc_designer_user_id, "X-TransactionId": str(uuid.uuid4()), - "X-FromAppId": application_id, + "X-FromAppId": self.config.application_id, }, "return_data": {"catalog_resource_id": ("uniqueId",)}, "auth": ( @@ -118,7 +113,7 @@ class VNFCatalog(SDCClient): endpoint=self.config.sdc.SDC_BE_ENDPOINT, service_path=self.config.sdc.SDC_CATALOG_RESOURCES_PATH, ), - "payload": "{}/catalog_vnf_input.jinja".format(PAYLOADS_DIR), + "payload": "{}/catalog_vnf_input.jinja".format(self.config.payload_directory), "payload-parameters": [ "input_default_value", "input_name", @@ -133,7 +128,7 @@ class VNFCatalog(SDCClient): "Content-Type": "application/json", "USER_ID": self.sdc_designer_user_id, "X-TransactionId": str(uuid.uuid4()), - "X-FromAppId": application_id, + "X-FromAppId": self.config.application_id, }, "auth": ( self.global_sdc_username, @@ -150,14 +145,14 @@ class VNFCatalog(SDCClient): ), "uri-parameters": ["catalog_resource_id"], "success_code": 200, - "payload": "{}/generic_payload.jinja".format(PAYLOADS_DIR), + "payload": "{}/generic_payload.jinja".format(self.config.payload_directory), "payload-parameters": ["payload_data"], "headers": { "Accept": "application/json", "Content-Type": "application/json", "USER_ID": self.sdc_designer_user_id, "X-TransactionId": str(uuid.uuid4()), - "X-FromAppId": application_id, + "X-FromAppId": self.config.application_id, }, "auth": ( self.global_sdc_username, @@ -179,7 +174,7 @@ class VNFCatalog(SDCClient): "Content-Type": "application/json", "USER_ID": self.sdc_designer_user_id, "X-TransactionId": str(uuid.uuid4()), - "X-FromAppId": application_id, + "X-FromAppId": self.config.application_id, }, "auth": ( self.global_sdc_username, @@ -194,7 +189,7 @@ class VNFCatalog(SDCClient): endpoint=self.config.sdc.SDC_BE_ENDPOINT, service_path=self.config.sdc.SDC_CATALOG_RESOURCES_PATH, ), - "payload": "{}/catalog_vnf_property.jinja".format(PAYLOADS_DIR), + "payload": "{}/catalog_vnf_property.jinja".format(self.config.payload_directory), "payload-parameters": [ "unique_id", "parent_unique_id", @@ -211,7 +206,7 @@ class VNFCatalog(SDCClient): "Content-Type": "application/json", "USER_ID": self.sdc_designer_user_id, "X-TransactionId": str(uuid.uuid4()), - "X-FromAppId": application_id, + "X-FromAppId": self.config.application_id, }, "auth": ( self.global_sdc_username, @@ -226,7 +221,7 @@ class VNFCatalog(SDCClient): endpoint=self.config.sdc.SDC_BE_ENDPOINT, service_path=self.config.sdc.SDC_CATALOG_RESOURCES_PATH, ), - "payload": "{}/catalog_vnf_property.jinja".format(PAYLOADS_DIR), + "payload": "{}/catalog_vnf_property.jinja".format(self.config.payload_directory), "payload-parameters": [ "unique_id", "parent_unique_id", @@ -243,7 +238,7 @@ class VNFCatalog(SDCClient): "Content-Type": "application/json", "USER_ID": self.sdc_designer_user_id, "X-TransactionId": str(uuid.uuid4()), - "X-FromAppId": application_id, + "X-FromAppId": self.config.application_id, }, "auth": ( self.global_sdc_username, @@ -265,7 +260,7 @@ class VNFCatalog(SDCClient): "Content-Type": "application/json", "USER_ID": self.sdc_designer_user_id, "X-TransactionId": str(uuid.uuid4()), - "X-FromAppId": application_id, + "X-FromAppId": self.config.application_id, }, "return_data": {"catalog_resource_id": ("uniqueId",)}, "auth": ( @@ -282,7 +277,7 @@ class VNFCatalog(SDCClient): service_path=self.config.sdc.SDC_CATALOG_RESOURCES_PATH, ), "uri-parameters": ["catalog_resource_id", "catalog_policy_id"], - "payload": "{}/catalog_vnf_policy_property.jinja".format(PAYLOADS_DIR), + "payload": "{}/catalog_vnf_policy_property.jinja".format(self.config.payload_directory), "payload-parameters": [ "unique_id", "property_name", @@ -296,7 +291,7 @@ class VNFCatalog(SDCClient): "Content-Type": "application/json", "USER_ID": self.sdc_designer_user_id, "X-TransactionId": str(uuid.uuid4()), - "X-FromAppId": application_id, + "X-FromAppId": self.config.application_id, }, "auth": ( self.global_sdc_username, @@ -318,7 +313,7 @@ class VNFCatalog(SDCClient): "Content-Type": "application/json", "USER_ID": self.sdc_designer_user_id, "X-TransactionId": str(uuid.uuid4()), - "X-FromAppId": application_id, + "X-FromAppId": self.config.application_id, }, "return_data": {"catalog_resource_id": ("uniqueId",)}, "auth": ( @@ -335,7 +330,7 @@ class VNFCatalog(SDCClient): service_path=self.config.sdc.SDC_CATALOG_RESOURCES_PATH, ), "uri-parameters": ["catalog_resource_id", "catalog_group_id"], - "payload": "{}/catalog_vnf_group_property.jinja".format(PAYLOADS_DIR), + "payload": "{}/catalog_vnf_group_property.jinja".format(self.config.payload_directory), "payload-parameters": [ "unique_id", "property_name", @@ -351,7 +346,7 @@ class VNFCatalog(SDCClient): "Content-Type": "application/json", "USER_ID": self.sdc_designer_user_id, "X-TransactionId": str(uuid.uuid4()), - "X-FromAppId": application_id, + "X-FromAppId": self.config.application_id, }, "auth": ( self.global_sdc_username, @@ -366,7 +361,7 @@ class VNFCatalog(SDCClient): endpoint=self.config.sdc.SDC_BE_ENDPOINT, service_path=self.config.sdc.SDC_CATALOG_RESOURCES_PATH, ), - "payload": "{}/catalog_vnf_group.jinja".format(PAYLOADS_DIR), + "payload": "{}/catalog_vnf_group.jinja".format(self.config.payload_directory), "payload-parameters": ["instance_id"], "uri-parameters": ["catalog_resource_id", "catalog_group_id"], "success_code": 200, @@ -375,7 +370,7 @@ class VNFCatalog(SDCClient): "Content-Type": "application/json", "USER_ID": self.sdc_designer_user_id, "X-TransactionId": str(uuid.uuid4()), - "X-FromAppId": application_id, + "X-FromAppId": self.config.application_id, }, "auth": ( self.global_sdc_username, @@ -390,7 +385,7 @@ class VNFCatalog(SDCClient): endpoint=self.config.sdc.SDC_BE_ENDPOINT, service_path=self.config.sdc.SDC_CATALOG_RESOURCES_PATH, ), - "payload": "{}/catalog_vnf_policy.jinja".format(PAYLOADS_DIR), + "payload": "{}/catalog_vnf_policy.jinja".format(self.config.payload_directory), "payload-parameters": ["instance_ids"], "uri-parameters": ["catalog_resource_id", "catalog_policy_id"], "success_code": 200, @@ -399,7 +394,7 @@ class VNFCatalog(SDCClient): "Content-Type": "application/json", "USER_ID": self.sdc_designer_user_id, "X-TransactionId": str(uuid.uuid4()), - "X-FromAppId": application_id, + "X-FromAppId": self.config.application_id, }, "auth": ( self.global_sdc_username, @@ -415,7 +410,7 @@ class VNFCatalog(SDCClient): service_path=self.config.sdc.SDC_CATALOG_RESOURCES_PATH, ), "uri-parameters": ["catalog_resource_id"], - "payload": "{}/resource_instance_vnf.jinja".format(PAYLOADS_DIR), + "payload": "{}/resource_instance_vnf.jinja".format(self.config.payload_directory), "payload-parameters": [ "milli_timestamp", "new_catalog_resource_id", @@ -431,7 +426,7 @@ class VNFCatalog(SDCClient): "Content-Type": "application/json", "USER_ID": self.sdc_designer_user_id, "X-TransactionId": str(uuid.uuid4()), - "X-FromAppId": application_id, + "X-FromAppId": self.config.application_id, }, "auth": ( self.global_sdc_username, @@ -447,7 +442,7 @@ class VNFCatalog(SDCClient): service_path=self.config.sdc.SDC_CATALOG_RESOURCES_PATH, ), "uri-parameters": ["catalog_resource_id"], - "payload": "{}/add_resource_relationship.jinja".format(PAYLOADS_DIR), + "payload": "{}/add_resource_relationship.jinja".format(self.config.payload_directory), "payload-parameters": [ "from_node_resource_id", "to_node_resource_id", @@ -464,7 +459,7 @@ class VNFCatalog(SDCClient): "Content-Type": "application/json", "USER_ID": self.sdc_designer_user_id, "X-TransactionId": str(uuid.uuid4()), - "X-FromAppId": application_id, + "X-FromAppId": self.config.application_id, }, "auth": ( self.global_sdc_username, @@ -486,7 +481,7 @@ class VNFCatalog(SDCClient): "Content-Type": "application/json", "USER_ID": self.sdc_designer_user_id, "X-TransactionId": str(uuid.uuid4()), - "X-FromAppId": application_id, + "X-FromAppId": self.config.application_id, }, "return_data": {"catalog_resource_name": ("name",)}, "auth": ( @@ -509,7 +504,7 @@ class VNFCatalog(SDCClient): "Content-Type": "application/json", "USER_ID": self.sdc_designer_user_id, "X-TransactionId": str(uuid.uuid4()), - "X-FromAppId": application_id, + "X-FromAppId": self.config.application_id, }, "auth": ( self.global_sdc_username, @@ -530,7 +525,7 @@ class VNFCatalog(SDCClient): "Content-Type": "application/json", "USER_ID": self.sdc_designer_user_id, "X-TransactionId": str(uuid.uuid4()), - "X-FromAppId": application_id, + "X-FromAppId": self.config.application_id, }, "return_data": {"resources": ("resources",)}, "auth": ( diff --git a/onap-client/onap_client/sdc/catalog/vsp_catalog.py b/onap-client/onap_client/sdc/catalog/vsp_catalog.py index c16fa16..f8ddb9b 100644 --- a/onap-client/onap_client/sdc/catalog/vsp_catalog.py +++ b/onap-client/onap_client/sdc/catalog/vsp_catalog.py @@ -34,16 +34,11 @@ # limitations under the License. # # ============LICENSE_END============================================ - import uuid from functools import partial -from onap_client import config from onap_client.sdc.client import SDCClient -PAYLOADS_DIR = config.PAYLOADS_DIR -application_id = config.APPLICATION_ID - class VSPCatalog(SDCClient): @property @@ -61,7 +56,7 @@ class VSPCatalog(SDCClient): endpoint=self.config.sdc.SDC_BE_ONBOARD_ENDPOINT, service_path=self.config.sdc.SDC_VENDOR_SOFTWARE_PRODUCT_PATH, ), - "payload": "{}/software_product.jinja".format(PAYLOADS_DIR), + "payload": "{}/software_product.jinja".format(self.config.payload_directory), "payload-parameters": [ "software_product_name", "feature_group_id", @@ -79,7 +74,7 @@ class VSPCatalog(SDCClient): "Content-Type": "application/json", "USER_ID": self.sdc_designer_user_id, "X-TransactionId": str(uuid.uuid4()), - "X-FromAppId": application_id, + "X-FromAppId": self.config.application_id, }, "return_data": { "software_product_id": ("itemId",), @@ -98,7 +93,7 @@ class VSPCatalog(SDCClient): endpoint=self.config.sdc.SDC_BE_ONBOARD_ENDPOINT, service_path=self.config.sdc.SDC_VENDOR_ITEMS_PATH, ), - "payload": "{}/software_product_update.jinja".format(PAYLOADS_DIR), + "payload": "{}/software_product_update.jinja".format(self.config.payload_directory), "payload-parameters": [ "description", ], @@ -109,7 +104,7 @@ class VSPCatalog(SDCClient): "Content-Type": "application/json", "USER_ID": self.sdc_designer_user_id, "X-TransactionId": str(uuid.uuid4()), - "X-FromAppId": application_id, + "X-FromAppId": self.config.application_id, }, "auth": ( self.global_sdc_username, @@ -132,7 +127,7 @@ class VSPCatalog(SDCClient): "Content-Type": "multipart/form-data", "USER_ID": self.sdc_designer_user_id, "X-TransactionId": str(uuid.uuid4()), - "X-FromAppId": application_id, + "X-FromAppId": self.config.application_id, }, "auth": ( self.global_sdc_username, @@ -154,7 +149,7 @@ class VSPCatalog(SDCClient): "Content-Type": "application/json", "USER_ID": self.sdc_designer_user_id, "X-TransactionId": str(uuid.uuid4()), - "X-FromAppId": application_id, + "X-FromAppId": self.config.application_id, }, "auth": ( self.global_sdc_username, @@ -170,7 +165,7 @@ class VSPCatalog(SDCClient): service_path=self.config.sdc.SDC_VENDOR_SOFTWARE_PRODUCT_PATH, ), "uri-parameters": ["software_product_id", "software_product_version_id"], - "payload": "{}/action.jinja".format(PAYLOADS_DIR), + "payload": "{}/action.jinja".format(self.config.payload_directory), "payload-parameters": ["action"], "success_code": 200, "headers": { @@ -178,7 +173,7 @@ class VSPCatalog(SDCClient): "Content-Type": "application/json", "USER_ID": self.sdc_designer_user_id, "X-TransactionId": str(uuid.uuid4()), - "X-FromAppId": application_id, + "X-FromAppId": self.config.application_id, }, "auth": ( self.global_sdc_username, @@ -194,7 +189,7 @@ class VSPCatalog(SDCClient): service_path=self.config.sdc.SDC_VENDOR_SOFTWARE_PRODUCT_PATH, ), "uri-parameters": ["software_product_id", "software_product_version_id"], - "payload": "{}/action.jinja".format(PAYLOADS_DIR), + "payload": "{}/action.jinja".format(self.config.payload_directory), "payload-parameters": ["action"], "success_code": 200, "headers": { @@ -202,7 +197,7 @@ class VSPCatalog(SDCClient): "Content-Type": "application/json", "USER_ID": self.sdc_designer_user_id, "X-TransactionId": str(uuid.uuid4()), - "X-FromAppId": application_id, + "X-FromAppId": self.config.application_id, }, "auth": ( self.global_sdc_username, @@ -224,7 +219,7 @@ class VSPCatalog(SDCClient): "Content-Type": "application/json", "USER_ID": self.sdc_designer_user_id, "X-TransactionId": str(uuid.uuid4()), - "X-FromAppId": application_id, + "X-FromAppId": self.config.application_id, }, "return_data": {"name": ("name",)}, "auth": ( @@ -247,7 +242,7 @@ class VSPCatalog(SDCClient): "Content-Type": "application/json", "USER_ID": self.sdc_designer_user_id, "X-TransactionId": str(uuid.uuid4()), - "X-FromAppId": application_id, + "X-FromAppId": self.config.application_id, }, "return_data": {"name": ("name",)}, "auth": ( @@ -270,7 +265,7 @@ class VSPCatalog(SDCClient): "Content-Type": "application/json", "USER_ID": self.sdc_designer_user_id, "X-TransactionId": str(uuid.uuid4()), - "X-FromAppId": application_id, + "X-FromAppId": self.config.application_id, }, "return_data": { "software_product_version_id": ("id",), @@ -295,7 +290,7 @@ class VSPCatalog(SDCClient): "Content-Type": "application/json", "USER_ID": self.sdc_designer_user_id, "X-TransactionId": str(uuid.uuid4()), - "X-FromAppId": application_id, + "X-FromAppId": self.config.application_id, }, "return_data": {"results": ("results",)}, "auth": ( @@ -318,7 +313,7 @@ class VSPCatalog(SDCClient): "Content-Type": "application/json", "USER_ID": self.sdc_designer_user_id, "X-TransactionId": str(uuid.uuid4()), - "X-FromAppId": application_id, + "X-FromAppId": self.config.application_id, }, "auth": ( self.global_sdc_username, @@ -334,7 +329,7 @@ class VSPCatalog(SDCClient): service_path=self.config.sdc.SDC_VENDOR_ITEMS_PATH, ), "uri-parameters": ["software_product_id"], - "payload": "{}/add_vsp_contributer.jinja".format(PAYLOADS_DIR), + "payload": "{}/add_vsp_contributer.jinja".format(self.config.payload_directory), "payload-parameters": ["user_id"], "success_code": 200, "headers": { @@ -342,7 +337,7 @@ class VSPCatalog(SDCClient): "Content-Type": "application/json", "USER_ID": self.sdc_designer_user_id, "X-TransactionId": str(uuid.uuid4()), - "X-FromAppId": application_id, + "X-FromAppId": self.config.application_id, }, "auth": ( self.global_sdc_username, @@ -358,7 +353,7 @@ class VSPCatalog(SDCClient): service_path=self.config.sdc.SDC_VENDOR_ITEMS_PATH, ), "uri-parameters": ["software_product_id"], - "payload": "{}/add_vsp_contributer.jinja".format(PAYLOADS_DIR), + "payload": "{}/add_vsp_contributer.jinja".format(self.config.payload_directory), "payload-parameters": ["user_id"], "success_code": 200, "headers": { @@ -366,7 +361,7 @@ class VSPCatalog(SDCClient): "Content-Type": "application/json", "USER_ID": self.sdc_designer_user_id, "X-TransactionId": str(uuid.uuid4()), - "X-FromAppId": application_id, + "X-FromAppId": self.config.application_id, }, "auth": ( self.global_sdc_username, |