diff options
Diffstat (limited to 'onap-client/onap_client/vid')
-rw-r--r-- | onap-client/onap_client/vid/catalog/maintenance_catalog.py | 23 | ||||
-rw-r--r-- | onap-client/onap_client/vid/client.py | 4 |
2 files changed, 9 insertions, 18 deletions
diff --git a/onap-client/onap_client/vid/catalog/maintenance_catalog.py b/onap-client/onap_client/vid/catalog/maintenance_catalog.py index 1c7bad0..32f12ea 100644 --- a/onap-client/onap_client/vid/catalog/maintenance_catalog.py +++ b/onap-client/onap_client/vid/catalog/maintenance_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.vid.client import VIDClient -PAYLOADS_DIR = config.PAYLOADS_DIR -application_id = config.APPLICATION_ID - class MaintenanceClient(VIDClient): @property @@ -62,13 +57,13 @@ class MaintenanceClient(VIDClient): service_path=self.config.vid.VID_MAINTENANCE_PATH, ), "payload-parameters": ["name"], - "payload": "{}/vid_maintenance.jinja".format(PAYLOADS_DIR), + "payload": "{}/vid_maintenance.jinja".format(self.config.payload_directory), "success_code": 200, "headers": { "Accept": "application/json", "Content-Type": "application/json", "X-TransactionId": str(uuid.uuid4()), - "X-FromAppId": application_id, + "X-FromAppId": self.config.application_id, }, "auth": (self.config.vid.VID_USERNAME, self.config.vid.VID_PASSWORD,), }, @@ -81,13 +76,13 @@ class MaintenanceClient(VIDClient): service_path=self.config.vid.VID_MAINTENANCE_PATH, ), "payload-parameters": ["name"], - "payload": "{}/vid_maintenance.jinja".format(PAYLOADS_DIR), + "payload": "{}/vid_maintenance.jinja".format(self.config.payload_directory), "success_code": 200, "headers": { "Accept": "application/json", "Content-Type": "application/json", "X-TransactionId": str(uuid.uuid4()), - "X-FromAppId": application_id, + "X-FromAppId": self.config.application_id, }, "auth": (self.config.vid.VID_USERNAME, self.config.vid.VID_PASSWORD,), }, @@ -100,13 +95,13 @@ class MaintenanceClient(VIDClient): service_path=self.config.vid.VID_MAINTENANCE_PATH, ), "payload-parameters": ["name"], - "payload": "{}/vid_maintenance.jinja".format(PAYLOADS_DIR), + "payload": "{}/vid_maintenance.jinja".format(self.config.payload_directory), "success_code": 200, "headers": { "Accept": "application/json", "Content-Type": "application/json", "X-TransactionId": str(uuid.uuid4()), - "X-FromAppId": application_id, + "X-FromAppId": self.config.application_id, }, "auth": (self.config.vid.VID_USERNAME, self.config.vid.VID_PASSWORD,), }, @@ -119,13 +114,13 @@ class MaintenanceClient(VIDClient): service_path=self.config.vid.VID_MAINTENANCE_PATH, ), "payload-parameters": ["name"], - "payload": "{}/vid_maintenance.jinja".format(PAYLOADS_DIR), + "payload": "{}/vid_maintenance.jinja".format(self.config.payload_directory), "success_code": 200, "headers": { "Accept": "application/json", "Content-Type": "application/json", "X-TransactionId": str(uuid.uuid4()), - "X-FromAppId": application_id, + "X-FromAppId": self.config.application_id, }, "auth": (self.config.vid.VID_USERNAME, self.config.vid.VID_PASSWORD,), }, @@ -142,7 +137,7 @@ class MaintenanceClient(VIDClient): "Accept": "application/json", "Content-Type": "application/json", "X-TransactionId": str(uuid.uuid4()), - "X-FromAppId": application_id, + "X-FromAppId": self.config.application_id, }, "auth": (self.config.vid.VID_USERNAME, self.config.vid.VID_PASSWORD,), }, diff --git a/onap-client/onap_client/vid/client.py b/onap-client/onap_client/vid/client.py index d3d4468..109f5b3 100644 --- a/onap-client/onap_client/vid/client.py +++ b/onap-client/onap_client/vid/client.py @@ -34,12 +34,8 @@ # limitations under the License. # # ============LICENSE_END============================================ - from functools import partial from onap_client.client.clients import Client -from onap_client import config - -application_id = config.APPLICATION_ID class VIDClient(Client): |