lockss-pyclient 0.1.0.dev2__py3-none-any.whl → 0.1.0.dev3__py3-none-any.whl

lockss/pyclient/config/__init__.py

@@ -26,17 +26,32 @@ from lockss.pyclient.config.api.utils_api import UtilsApi
 from lockss.pyclient.config.api_client import ApiClient
 from lockss.pyclient.config.configuration import Configuration
 # import models into sdk package
+from lockss.pyclient.config.models.access_type import AccessType
 from lockss.pyclient.config.models.api_status import ApiStatus
+from lockss.pyclient.config.models.au_agreements import AuAgreements
+from lockss.pyclient.config.models.au_config_page_info import AuConfigPageInfo
 from lockss.pyclient.config.models.au_configuration import AuConfiguration
+from lockss.pyclient.config.models.au_state_bean import AuStateBean
 from lockss.pyclient.config.models.au_status import AuStatus
+from lockss.pyclient.config.models.au_suspect_url_versions import AuSuspectUrlVersions
 from lockss.pyclient.config.models.au_ws_result import AuWsResult
 from lockss.pyclient.config.models.auids_body import AuidsBody
 from lockss.pyclient.config.models.check_substance_result import CheckSubstanceResult
 from lockss.pyclient.config.models.content_configuration_result import ContentConfigurationResult
+from lockss.pyclient.config.models.dated_peer_id_set_impl import DatedPeerIdSetImpl
 from lockss.pyclient.config.models.file_section_name_body import FileSectionNameBody
+from lockss.pyclient.config.models.hash_result import HashResult
+from lockss.pyclient.config.models.page_info import PageInfo
+from lockss.pyclient.config.models.peer_agreement import PeerAgreement
+from lockss.pyclient.config.models.peer_agreements import PeerAgreements
 from lockss.pyclient.config.models.platform_configuration_ws_result import PlatformConfigurationWsResult
+from lockss.pyclient.config.models.platform_configuration_ws_result_daemon_version import PlatformConfigurationWsResultDaemonVersion
+from lockss.pyclient.config.models.platform_configuration_ws_result_java_version import PlatformConfigurationWsResultJavaVersion
+from lockss.pyclient.config.models.platform_configuration_ws_result_platform import PlatformConfigurationWsResultPlatform
 from lockss.pyclient.config.models.plugin_ws_result import PluginWsResult
 from lockss.pyclient.config.models.request_au_control_result import RequestAuControlResult
+from lockss.pyclient.config.models.substance_checker_state import SubstanceCheckerState
+from lockss.pyclient.config.models.suspect_url_version import SuspectUrlVersion
 from lockss.pyclient.config.models.tdb_au_ws_result import TdbAuWsResult
 from lockss.pyclient.config.models.tdb_publisher_ws_result import TdbPublisherWsResult
 from lockss.pyclient.config.models.tdb_title_ws_result import TdbTitleWsResult

lockss/pyclient/config/api/aus_api.py

@@ -339,7 +339,9 @@ class AusApi(object):
         >>> result = thread.get()
 
         :param async_req bool
-        :return: list[AuConfiguration]
+        :param int limit: The requested maximum number of AU configurations per response
+        :param str continuation_token: The continuation token of the next page of AU configurations to be returned
+        :return: AuConfigPageInfo
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -360,12 +362,14 @@ class AusApi(object):
         >>> result = thread.get()
 
         :param async_req bool
-        :return: list[AuConfiguration]
+        :param int limit: The requested maximum number of AU configurations per response
+        :param str continuation_token: The continuation token of the next page of AU configurations to be returned
+        :return: AuConfigPageInfo
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
-        all_params = []  # noqa: E501
+        all_params = ['limit', 'continuation_token']  # noqa: E501
         all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
@@ -386,6 +390,10 @@ class AusApi(object):
         path_params = {}
 
         query_params = []
+        if 'limit' in params:
+            query_params.append(('limit', params['limit']))  # noqa: E501
+        if 'continuation_token' in params:
+            query_params.append(('continuationToken', params['continuation_token']))  # noqa: E501
 
         header_params = {}
 
@@ -408,7 +416,7 @@ class AusApi(object):
             body=body_params,
             post_params=form_params,
             files=local_var_files,
-            response_type='list[AuConfiguration]',  # noqa: E501
+            response_type='AuConfigPageInfo',  # noqa: E501
             auth_settings=auth_settings,
             async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
@@ -521,7 +529,7 @@ class AusApi(object):
         >>> result = thread.get()
 
         :param async_req bool
-        :param str auid: The identifier of the AU for which the configuration is\\ \\ requested (required)
+        :param str auid: The identifier of the AU for which the configuration is requested (required)
         :return: AuConfiguration
                  If the method is called asynchronously,
                  returns the request thread.
@@ -543,7 +551,7 @@ class AusApi(object):
         >>> result = thread.get()
 
         :param async_req bool
-        :param str auid: The identifier of the AU for which the configuration is\\ \\ requested (required)
+        :param str auid: The identifier of the AU for which the configuration is requested (required)
         :return: AuConfiguration
                  If the method is called asynchronously,
                  returns the request thread.

lockss/pyclient/config/api/config_api.py

@@ -305,9 +305,9 @@ class ConfigApi(object):
         :param async_req bool
         :param str section_name: The name of the section for which the configuration file is requested (required)
         :param str if_match: The If-Match header
-        :param str if_modified_since: The If-Match header
-        :param str if_none_match: The If-Match header
-        :param str if_unmodified_since: The If-Match header
+        :param str if_modified_since: The If-Modified-Since header
+        :param str if_none_match: The If-None-Match header
+        :param str if_unmodified_since: The If-Unmodified-Since header
         :return: str
                  If the method is called asynchronously,
                  returns the request thread.
@@ -331,9 +331,9 @@ class ConfigApi(object):
         :param async_req bool
         :param str section_name: The name of the section for which the configuration file is requested (required)
         :param str if_match: The If-Match header
-        :param str if_modified_since: The If-Match header
-        :param str if_none_match: The If-Match header
-        :param str if_unmodified_since: The If-Match header
+        :param str if_modified_since: The If-Modified-Since header
+        :param str if_none_match: The If-None-Match header
+        :param str if_unmodified_since: The If-Unmodified-Since header
         :return: str
                  If the method is called asynchronously,
                  returns the request thread.
@@ -416,9 +416,9 @@ class ConfigApi(object):
         :param async_req bool
         :param str url: The URL for which the configuration is requested (required)
         :param str if_match: The If-Match header
-        :param str if_modified_since: The If-Match header
-        :param str if_none_match: The If-Match header
-        :param str if_unmodified_since: The If-Match header
+        :param str if_modified_since: The If-Modified-Since header
+        :param str if_none_match: The If-None-Match header
+        :param str if_unmodified_since: The If-Unmodified-Since header
         :return: str
                  If the method is called asynchronously,
                  returns the request thread.
@@ -442,9 +442,9 @@ class ConfigApi(object):
         :param async_req bool
         :param str url: The URL for which the configuration is requested (required)
         :param str if_match: The If-Match header
-        :param str if_modified_since: The If-Match header
-        :param str if_none_match: The If-Match header
-        :param str if_unmodified_since: The If-Match header
+        :param str if_modified_since: The If-Modified-Since header
+        :param str if_none_match: The If-None-Match header
+        :param str if_unmodified_since: The If-Unmodified-Since header
         :return: str
                  If the method is called asynchronously,
                  returns the request thread.

lockss/pyclient/config/api/utils_api.py

@@ -106,13 +106,13 @@ class UtilsApi(object):
         body_params = None
         # HTTP header `Accept`
         header_params['Accept'] = self.api_client.select_header_accept(
-            ['application/json', 'text/plain'])  # noqa: E501
+            ['application/json;q=0.9', 'text/plain'])  # noqa: E501
 
         # Authentication setting
         auth_settings = ['basicAuth']  # noqa: E501
 
         return self.api_client.call_api(
-            '/utils/normalizeUrl', 'GET',
+            '/utils/normalizeurl', 'GET',
             path_params,
             query_params,
             header_params,

lockss/pyclient/config/configuration.py

@@ -46,7 +46,7 @@ class Configuration(six.with_metaclass(TypeWithDefault, object)):
     def __init__(self):
         """Constructor"""
         # Default Base url
-        self.host = "https://laaws.lockss.org:443/"
+        self.host = "{proto}://{hostname}:{port}/"
         # Temp file folder for downloading files
         self.temp_folder_path = None
 

lockss/pyclient/config/models/__init__.py

@@ -14,17 +14,32 @@
 from __future__ import absolute_import
 
 # import models into model package
+from lockss.pyclient.config.models.access_type import AccessType
 from lockss.pyclient.config.models.api_status import ApiStatus
+from lockss.pyclient.config.models.au_agreements import AuAgreements
+from lockss.pyclient.config.models.au_config_page_info import AuConfigPageInfo
 from lockss.pyclient.config.models.au_configuration import AuConfiguration
+from lockss.pyclient.config.models.au_state_bean import AuStateBean
 from lockss.pyclient.config.models.au_status import AuStatus
+from lockss.pyclient.config.models.au_suspect_url_versions import AuSuspectUrlVersions
 from lockss.pyclient.config.models.au_ws_result import AuWsResult
 from lockss.pyclient.config.models.auids_body import AuidsBody
 from lockss.pyclient.config.models.check_substance_result import CheckSubstanceResult
 from lockss.pyclient.config.models.content_configuration_result import ContentConfigurationResult
+from lockss.pyclient.config.models.dated_peer_id_set_impl import DatedPeerIdSetImpl
 from lockss.pyclient.config.models.file_section_name_body import FileSectionNameBody
+from lockss.pyclient.config.models.hash_result import HashResult
+from lockss.pyclient.config.models.page_info import PageInfo
+from lockss.pyclient.config.models.peer_agreement import PeerAgreement
+from lockss.pyclient.config.models.peer_agreements import PeerAgreements
 from lockss.pyclient.config.models.platform_configuration_ws_result import PlatformConfigurationWsResult
+from lockss.pyclient.config.models.platform_configuration_ws_result_daemon_version import PlatformConfigurationWsResultDaemonVersion
+from lockss.pyclient.config.models.platform_configuration_ws_result_java_version import PlatformConfigurationWsResultJavaVersion
+from lockss.pyclient.config.models.platform_configuration_ws_result_platform import PlatformConfigurationWsResultPlatform
 from lockss.pyclient.config.models.plugin_ws_result import PluginWsResult
 from lockss.pyclient.config.models.request_au_control_result import RequestAuControlResult
+from lockss.pyclient.config.models.substance_checker_state import SubstanceCheckerState
+from lockss.pyclient.config.models.suspect_url_version import SuspectUrlVersion
 from lockss.pyclient.config.models.tdb_au_ws_result import TdbAuWsResult
 from lockss.pyclient.config.models.tdb_publisher_ws_result import TdbPublisherWsResult
 from lockss.pyclient.config.models.tdb_title_ws_result import TdbTitleWsResult

lockss/pyclient/config/models/access_type.py

@@ -0,0 +1,90 @@
+# coding: utf-8
+
+"""
+    LOCKSS Configuration Service REST API
+
+    REST API of the LOCKSS Configuration Service  # noqa: E501
+
+    OpenAPI spec version: 2.0.0
+    Contact: lockss-support@lockss.org
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+class AccessType(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    allowed enum values
+    """
+    OPENACCESS = "OpenAccess"
+    SUBSCRIPTION = "Subscription"
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+    }
+
+    attribute_map = {
+    }
+
+    def __init__(self):  # noqa: E501
+        """AccessType - a model defined in Swagger"""  # noqa: E501
+        self.discriminator = None
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(AccessType, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, AccessType):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other

lockss/pyclient/config/models/au_agreements.py

@@ -0,0 +1,136 @@
+# coding: utf-8
+
+"""
+    LOCKSS Configuration Service REST API
+
+    REST API of the LOCKSS Configuration Service  # noqa: E501
+
+    OpenAPI spec version: 2.0.0
+    Contact: lockss-support@lockss.org
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+class AuAgreements(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'auid': 'str',
+        'raw_map': 'dict(str, PeerAgreements)'
+    }
+
+    attribute_map = {
+        'auid': 'auid',
+        'raw_map': 'rawMap'
+    }
+
+    def __init__(self, auid=None, raw_map=None):  # noqa: E501
+        """AuAgreements - a model defined in Swagger"""  # noqa: E501
+        self._auid = None
+        self._raw_map = None
+        self.discriminator = None
+        if auid is not None:
+            self.auid = auid
+        if raw_map is not None:
+            self.raw_map = raw_map
+
+    @property
+    def auid(self):
+        """Gets the auid of this AuAgreements.  # noqa: E501
+
+
+        :return: The auid of this AuAgreements.  # noqa: E501
+        :rtype: str
+        """
+        return self._auid
+
+    @auid.setter
+    def auid(self, auid):
+        """Sets the auid of this AuAgreements.
+
+
+        :param auid: The auid of this AuAgreements.  # noqa: E501
+        :type: str
+        """
+
+        self._auid = auid
+
+    @property
+    def raw_map(self):
+        """Gets the raw_map of this AuAgreements.  # noqa: E501
+
+
+        :return: The raw_map of this AuAgreements.  # noqa: E501
+        :rtype: dict(str, PeerAgreements)
+        """
+        return self._raw_map
+
+    @raw_map.setter
+    def raw_map(self, raw_map):
+        """Sets the raw_map of this AuAgreements.
+
+
+        :param raw_map: The raw_map of this AuAgreements.  # noqa: E501
+        :type: dict(str, PeerAgreements)
+        """
+
+        self._raw_map = raw_map
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(AuAgreements, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, AuAgreements):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other

lockss/pyclient/config/models/au_config_page_info.py

@@ -0,0 +1,140 @@
+# coding: utf-8
+
+"""
+    LOCKSS Configuration Service REST API
+
+    REST API of the LOCKSS Configuration Service  # noqa: E501
+
+    OpenAPI spec version: 2.0.0
+    Contact: lockss-support@lockss.org
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+class AuConfigPageInfo(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'au_configs': 'list[AuConfiguration]',
+        'page_info': 'PageInfo'
+    }
+
+    attribute_map = {
+        'au_configs': 'auConfigs',
+        'page_info': 'pageInfo'
+    }
+
+    def __init__(self, au_configs=None, page_info=None):  # noqa: E501
+        """AuConfigPageInfo - a model defined in Swagger"""  # noqa: E501
+        self._au_configs = None
+        self._page_info = None
+        self.discriminator = None
+        self.au_configs = au_configs
+        self.page_info = page_info
+
+    @property
+    def au_configs(self):
+        """Gets the au_configs of this AuConfigPageInfo.  # noqa: E501
+
+        The AU configurations included in the page  # noqa: E501
+
+        :return: The au_configs of this AuConfigPageInfo.  # noqa: E501
+        :rtype: list[AuConfiguration]
+        """
+        return self._au_configs
+
+    @au_configs.setter
+    def au_configs(self, au_configs):
+        """Sets the au_configs of this AuConfigPageInfo.
+
+        The AU configurations included in the page  # noqa: E501
+
+        :param au_configs: The au_configs of this AuConfigPageInfo.  # noqa: E501
+        :type: list[AuConfiguration]
+        """
+        if au_configs is None:
+            raise ValueError("Invalid value for `au_configs`, must not be `None`")  # noqa: E501
+
+        self._au_configs = au_configs
+
+    @property
+    def page_info(self):
+        """Gets the page_info of this AuConfigPageInfo.  # noqa: E501
+
+
+        :return: The page_info of this AuConfigPageInfo.  # noqa: E501
+        :rtype: PageInfo
+        """
+        return self._page_info
+
+    @page_info.setter
+    def page_info(self, page_info):
+        """Sets the page_info of this AuConfigPageInfo.
+
+
+        :param page_info: The page_info of this AuConfigPageInfo.  # noqa: E501
+        :type: PageInfo
+        """
+        if page_info is None:
+            raise ValueError("Invalid value for `page_info`, must not be `None`")  # noqa: E501
+
+        self._page_info = page_info
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(AuConfigPageInfo, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, AuConfigPageInfo):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other