diff options
Diffstat (limited to 'onap-client/onap_client/vid')
-rw-r--r-- | onap-client/onap_client/vid/__init__.py | 4 | ||||
-rw-r--r-- | onap-client/onap_client/vid/catalog/maintenance_catalog.py | 199 | ||||
-rw-r--r-- | onap-client/onap_client/vid/client.py | 31 |
3 files changed, 110 insertions, 124 deletions
diff --git a/onap-client/onap_client/vid/__init__.py b/onap-client/onap_client/vid/__init__.py index 1cb6244..5519a84 100644 --- a/onap-client/onap_client/vid/__init__.py +++ b/onap-client/onap_client/vid/__init__.py @@ -34,7 +34,3 @@ # limitations under the License. # # ============LICENSE_END============================================ - -from onap_client.config import APP_CONFIG - -VID_PROPERTIES = APP_CONFIG.vid diff --git a/onap-client/onap_client/vid/catalog/maintenance_catalog.py b/onap-client/onap_client/vid/catalog/maintenance_catalog.py index 2f01a79..1c7bad0 100644 --- a/onap-client/onap_client/vid/catalog/maintenance_catalog.py +++ b/onap-client/onap_client/vid/catalog/maintenance_catalog.py @@ -38,117 +38,112 @@ import uuid from functools import partial -from onap_client import vid from onap_client import config from onap_client.vid.client import VIDClient PAYLOADS_DIR = config.PAYLOADS_DIR -vid_properties = vid.VID_PROPERTIES application_id = config.APPLICATION_ID class MaintenanceClient(VIDClient): @property - def catalog_resources(self): - return CATALOG_RESOURCES - - @property def namespace(self): return "maintenance" - -CATALOG_RESOURCES = { - "CREATE_OWNING_ENTITY": { - "verb": "POST", - "description": "Creates an owning entity in VID", - "uri": partial( - "{endpoint}{service_path}/category_parameter/owningEntity".format, - endpoint=vid_properties.VID_ENDPOINT, - service_path=vid_properties.VID_MAINTENANCE_PATH, - ), - "payload-parameters": ["name"], - "payload": "{}/vid_maintenance.jinja".format(PAYLOADS_DIR), - "success_code": 200, - "headers": { - "Accept": "application/json", - "Content-Type": "application/json", - "X-TransactionId": str(uuid.uuid4()), - "X-FromAppId": application_id, - }, - "auth": (vid_properties.VID_USERNAME, vid_properties.VID_PASSWORD,), - }, - "CREATE_LINE_OF_BUSINESS": { - "verb": "POST", - "description": "Creates a line of business in VID", - "uri": partial( - "{endpoint}{service_path}/category_parameter/lineOfBusiness".format, - endpoint=vid_properties.VID_ENDPOINT, - service_path=vid_properties.VID_MAINTENANCE_PATH, - ), - "payload-parameters": ["name"], - "payload": "{}/vid_maintenance.jinja".format(PAYLOADS_DIR), - "success_code": 200, - "headers": { - "Accept": "application/json", - "Content-Type": "application/json", - "X-TransactionId": str(uuid.uuid4()), - "X-FromAppId": application_id, - }, - "auth": (vid_properties.VID_USERNAME, vid_properties.VID_PASSWORD,), - }, - "CREATE_PLATFORM": { - "verb": "POST", - "description": "Creates a platform in VID", - "uri": partial( - "{endpoint}{service_path}/category_parameter/platform".format, - endpoint=vid_properties.VID_ENDPOINT, - service_path=vid_properties.VID_MAINTENANCE_PATH, - ), - "payload-parameters": ["name"], - "payload": "{}/vid_maintenance.jinja".format(PAYLOADS_DIR), - "success_code": 200, - "headers": { - "Accept": "application/json", - "Content-Type": "application/json", - "X-TransactionId": str(uuid.uuid4()), - "X-FromAppId": application_id, - }, - "auth": (vid_properties.VID_USERNAME, vid_properties.VID_PASSWORD,), - }, - "CREATE_PROJECT": { - "verb": "POST", - "description": "Creates a project in VID", - "uri": partial( - "{endpoint}{service_path}/category_parameter/project".format, - endpoint=vid_properties.VID_ENDPOINT, - service_path=vid_properties.VID_MAINTENANCE_PATH, - ), - "payload-parameters": ["name"], - "payload": "{}/vid_maintenance.jinja".format(PAYLOADS_DIR), - "success_code": 200, - "headers": { - "Accept": "application/json", - "Content-Type": "application/json", - "X-TransactionId": str(uuid.uuid4()), - "X-FromAppId": application_id, - }, - "auth": (vid_properties.VID_USERNAME, vid_properties.VID_PASSWORD,), - }, - "GET_CATEGORY_PARAMETERS": { - "verb": "GET", - "description": "Returns the category parameters currently stored in VID", - "uri": partial( - "{endpoint}{service_path}/category_parameter?familyName=PARAMETER_STANDARDIZATION".format, - endpoint=vid_properties.VID_ENDPOINT, - service_path=vid_properties.VID_MAINTENANCE_PATH, - ), - "success_code": 200, - "headers": { - "Accept": "application/json", - "Content-Type": "application/json", - "X-TransactionId": str(uuid.uuid4()), - "X-FromAppId": application_id, - }, - "auth": (vid_properties.VID_USERNAME, vid_properties.VID_PASSWORD,), - }, -} + @property + def catalog_resources(self): + return { + "CREATE_OWNING_ENTITY": { + "verb": "POST", + "description": "Creates an owning entity in VID", + "uri": partial( + "{endpoint}{service_path}/category_parameter/owningEntity".format, + endpoint=self.config.vid.VID_ENDPOINT, + service_path=self.config.vid.VID_MAINTENANCE_PATH, + ), + "payload-parameters": ["name"], + "payload": "{}/vid_maintenance.jinja".format(PAYLOADS_DIR), + "success_code": 200, + "headers": { + "Accept": "application/json", + "Content-Type": "application/json", + "X-TransactionId": str(uuid.uuid4()), + "X-FromAppId": application_id, + }, + "auth": (self.config.vid.VID_USERNAME, self.config.vid.VID_PASSWORD,), + }, + "CREATE_LINE_OF_BUSINESS": { + "verb": "POST", + "description": "Creates a line of business in VID", + "uri": partial( + "{endpoint}{service_path}/category_parameter/lineOfBusiness".format, + endpoint=self.config.vid.VID_ENDPOINT, + service_path=self.config.vid.VID_MAINTENANCE_PATH, + ), + "payload-parameters": ["name"], + "payload": "{}/vid_maintenance.jinja".format(PAYLOADS_DIR), + "success_code": 200, + "headers": { + "Accept": "application/json", + "Content-Type": "application/json", + "X-TransactionId": str(uuid.uuid4()), + "X-FromAppId": application_id, + }, + "auth": (self.config.vid.VID_USERNAME, self.config.vid.VID_PASSWORD,), + }, + "CREATE_PLATFORM": { + "verb": "POST", + "description": "Creates a platform in VID", + "uri": partial( + "{endpoint}{service_path}/category_parameter/platform".format, + endpoint=self.config.vid.VID_ENDPOINT, + service_path=self.config.vid.VID_MAINTENANCE_PATH, + ), + "payload-parameters": ["name"], + "payload": "{}/vid_maintenance.jinja".format(PAYLOADS_DIR), + "success_code": 200, + "headers": { + "Accept": "application/json", + "Content-Type": "application/json", + "X-TransactionId": str(uuid.uuid4()), + "X-FromAppId": application_id, + }, + "auth": (self.config.vid.VID_USERNAME, self.config.vid.VID_PASSWORD,), + }, + "CREATE_PROJECT": { + "verb": "POST", + "description": "Creates a project in VID", + "uri": partial( + "{endpoint}{service_path}/category_parameter/project".format, + endpoint=self.config.vid.VID_ENDPOINT, + service_path=self.config.vid.VID_MAINTENANCE_PATH, + ), + "payload-parameters": ["name"], + "payload": "{}/vid_maintenance.jinja".format(PAYLOADS_DIR), + "success_code": 200, + "headers": { + "Accept": "application/json", + "Content-Type": "application/json", + "X-TransactionId": str(uuid.uuid4()), + "X-FromAppId": application_id, + }, + "auth": (self.config.vid.VID_USERNAME, self.config.vid.VID_PASSWORD,), + }, + "GET_CATEGORY_PARAMETERS": { + "verb": "GET", + "description": "Returns the category parameters currently stored in VID", + "uri": partial( + "{endpoint}{service_path}/category_parameter?familyName=PARAMETER_STANDARDIZATION".format, + endpoint=self.config.vid.VID_ENDPOINT, + service_path=self.config.vid.VID_MAINTENANCE_PATH, + ), + "success_code": 200, + "headers": { + "Accept": "application/json", + "Content-Type": "application/json", + "X-TransactionId": str(uuid.uuid4()), + "X-FromAppId": 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 3b95618..d3d4468 100644 --- a/onap-client/onap_client/vid/client.py +++ b/onap-client/onap_client/vid/client.py @@ -36,11 +36,9 @@ # ============LICENSE_END============================================ from functools import partial -from onap_client import vid from onap_client.client.clients import Client from onap_client import config -vid_properties = vid.VID_PROPERTIES application_id = config.APPLICATION_ID @@ -51,19 +49,16 @@ class VIDClient(Client): @property def catalog_resources(self): - return CATALOG_RESOURCES - - -CATALOG_RESOURCES = { - "HEALTH_CHECK": { - "verb": "GET", - "description": "Queries VID health check endpoint", - "uri": partial( - "{endpoint}{service_path}".format, - endpoint=vid_properties.VID_ENDPOINT, - service_path=vid_properties.VID_HEALTH_CHECK_PATH, - ), - "success_code": 200, - "auth": (vid_properties.VID_USERNAME, vid_properties.VID_PASSWORD,), - }, -} + return { + "HEALTH_CHECK": { + "verb": "GET", + "description": "Queries VID health check endpoint", + "uri": partial( + "{endpoint}{service_path}".format, + endpoint=self.config.vid.VID_ENDPOINT, + service_path=self.config.vid.VID_HEALTH_CHECK_PATH, + ), + "success_code": 200, + "auth": (self.config.vid.VID_USERNAME, self.config.vid.VID_PASSWORD,), + }, + } |