aboutsummaryrefslogtreecommitdiffstats
path: root/onap-client/onap_client/vid/catalog/maintenance_catalog.py
diff options
context:
space:
mode:
authorstark, steven <steven.stark@att.com>2020-09-17 13:04:35 -0700
committerstark, steven <steven.stark@att.com>2020-09-17 13:04:35 -0700
commit35375724d9657de99adb8e530e1be21305555a40 (patch)
tree28806a1a1317426546ffdb9755d6f632ce088605 /onap-client/onap_client/vid/catalog/maintenance_catalog.py
parent591c548e569423dad8d106d4d2cd26bc5ce24b19 (diff)
[VVP] Updating onap-client
Removing dependency on distutils moving etc/ to package resource Adding support for volume creation and delete Removing module level imports Adding delete capability to spec-engine Adding kwarg to pass Client instance to functions Issue-ID: VVP-469 Signed-off-by: stark, steven <steven.stark@att.com> Change-Id: Ie00065f54411c8ff40ea20c35fe919ce15f65e6a
Diffstat (limited to 'onap-client/onap_client/vid/catalog/maintenance_catalog.py')
-rw-r--r--onap-client/onap_client/vid/catalog/maintenance_catalog.py23
1 files changed, 9 insertions, 14 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,),
},