pulp_container_client 2.22.2 → 2.23.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/README.md +17 -14
- data/docs/AsyncOperationResponse.md +8 -7
- data/docs/ContainerBlobResponse.md +18 -17
- data/docs/ContainerContainerDistribution.md +24 -23
- data/docs/ContainerContainerDistributionResponse.md +40 -39
- data/docs/ContainerContainerNamespace.md +8 -7
- data/docs/ContainerContainerNamespaceResponse.md +16 -15
- data/docs/ContainerContainerPullThroughDistribution.md +26 -25
- data/docs/ContainerContainerPullThroughDistributionResponse.md +38 -37
- data/docs/ContainerContainerPullThroughRemote.md +52 -51
- data/docs/ContainerContainerPullThroughRemoteResponse.md +52 -51
- data/docs/ContainerContainerPullThroughRemoteResponseHiddenFieldsInner.md +20 -0
- data/docs/ContainerContainerPushRepository.md +16 -15
- data/docs/ContainerContainerPushRepositoryResponse.md +28 -27
- data/docs/ContainerContainerRemote.md +56 -55
- data/docs/ContainerContainerRemoteResponse.md +56 -55
- data/docs/ContainerContainerRepository.md +18 -17
- data/docs/ContainerContainerRepositoryResponse.md +30 -29
- data/docs/ContainerManifestResponse.md +42 -41
- data/docs/ContainerManifestSignatureResponse.md +28 -27
- data/docs/ContainerRepositorySyncURL.md +12 -11
- data/docs/ContainerTagResponse.md +18 -17
- data/docs/ContentBlobsApi.md +82 -49
- data/docs/ContentManifestsApi.md +86 -53
- data/docs/ContentSignaturesApi.md +97 -64
- data/docs/ContentSummaryResponse.md +12 -11
- data/docs/ContentTagsApi.md +86 -53
- data/docs/DistributionsContainerApi.md +386 -183
- data/docs/DistributionsPullThroughApi.md +385 -182
- data/docs/ManifestCopy.md +14 -13
- data/docs/MediaTypesEnum.md +4 -5
- data/docs/MyPermissionsResponse.md +8 -7
- data/docs/NestedRole.md +12 -11
- data/docs/NestedRoleResponse.md +12 -11
- data/docs/ObjectRolesResponse.md +8 -7
- data/docs/PaginatedRepositoryVersionResponseList.md +14 -13
- data/docs/PaginatedcontainerBlobResponseList.md +14 -13
- data/docs/PaginatedcontainerContainerDistributionResponseList.md +14 -13
- data/docs/PaginatedcontainerContainerNamespaceResponseList.md +14 -13
- data/docs/PaginatedcontainerContainerPullThroughDistributionResponseList.md +14 -13
- data/docs/PaginatedcontainerContainerPullThroughRemoteResponseList.md +14 -13
- data/docs/PaginatedcontainerContainerPushRepositoryResponseList.md +14 -13
- data/docs/PaginatedcontainerContainerRemoteResponseList.md +14 -13
- data/docs/PaginatedcontainerContainerRepositoryResponseList.md +14 -13
- data/docs/PaginatedcontainerManifestResponseList.md +14 -13
- data/docs/PaginatedcontainerManifestSignatureResponseList.md +14 -13
- data/docs/PaginatedcontainerTagResponseList.md +14 -13
- data/docs/PatchedcontainerContainerDistribution.md +24 -23
- data/docs/PatchedcontainerContainerPullThroughDistribution.md +26 -25
- data/docs/PatchedcontainerContainerPullThroughRemote.md +52 -51
- data/docs/PatchedcontainerContainerPushRepository.md +16 -15
- data/docs/PatchedcontainerContainerRemote.md +56 -55
- data/docs/PatchedcontainerContainerRepository.md +18 -17
- data/docs/Policy692Enum.md +4 -5
- data/docs/Policy7e0Enum.md +4 -5
- data/docs/PulpContainerNamespacesApi.md +259 -124
- data/docs/RecursiveManage.md +8 -7
- data/docs/RemotesContainerApi.md +389 -184
- data/docs/RemotesPullThroughApi.md +389 -184
- data/docs/RemoveImage.md +8 -7
- data/docs/RemoveSignatures.md +8 -7
- data/docs/RemoveSignaturesResponse.md +8 -7
- data/docs/Repair.md +8 -7
- data/docs/RepositoriesContainerApi.md +647 -291
- data/docs/RepositoriesContainerPushApi.md +419 -198
- data/docs/RepositoriesContainerPushVersionsApi.md +152 -82
- data/docs/RepositoriesContainerVersionsApi.md +152 -82
- data/docs/RepositorySign.md +12 -11
- data/docs/RepositoryVersionResponse.md +22 -21
- data/docs/SetLabel.md +10 -9
- data/docs/SetLabelResponse.md +10 -9
- data/docs/TagCopy.md +12 -11
- data/docs/TagImage.md +10 -9
- data/docs/TokenApi.md +25 -7
- data/docs/UnTagImage.md +8 -7
- data/docs/UnsetLabel.md +8 -7
- data/docs/UnsetLabelResponse.md +10 -9
- data/lib/pulp_container_client/api/content_blobs_api.rb +11 -9
- data/lib/pulp_container_client/api/content_manifests_api.rb +11 -9
- data/lib/pulp_container_client/api/content_signatures_api.rb +11 -9
- data/lib/pulp_container_client/api/content_tags_api.rb +11 -9
- data/lib/pulp_container_client/api/distributions_container_api.rb +89 -56
- data/lib/pulp_container_client/api/distributions_pull_through_api.rb +89 -56
- data/lib/pulp_container_client/api/pulp_container_namespaces_api.rb +53 -36
- data/lib/pulp_container_client/api/remotes_container_api.rb +104 -68
- data/lib/pulp_container_client/api/remotes_pull_through_api.rb +104 -68
- data/lib/pulp_container_client/api/repositories_container_api.rb +171 -102
- data/lib/pulp_container_client/api/repositories_container_push_api.rb +102 -62
- data/lib/pulp_container_client/api/repositories_container_push_versions_api.rb +40 -30
- data/lib/pulp_container_client/api/repositories_container_versions_api.rb +40 -30
- data/lib/pulp_container_client/api/token_api.rb +5 -4
- data/lib/pulp_container_client/api_client.rb +137 -102
- data/lib/pulp_container_client/api_error.rb +2 -1
- data/lib/pulp_container_client/configuration.rb +162 -21
- data/lib/pulp_container_client/models/async_operation_response.rb +32 -22
- data/lib/pulp_container_client/models/container_blob_response.rb +37 -29
- data/lib/pulp_container_client/models/container_container_distribution.rb +66 -54
- data/lib/pulp_container_client/models/container_container_distribution_response.rb +95 -83
- data/lib/pulp_container_client/models/container_container_namespace.rb +32 -22
- data/lib/pulp_container_client/models/container_container_namespace_response.rb +34 -24
- data/lib/pulp_container_client/models/container_container_pull_through_distribution.rb +68 -54
- data/lib/pulp_container_client/models/container_container_pull_through_distribution_response.rb +97 -83
- data/lib/pulp_container_client/models/container_container_pull_through_remote.rb +56 -22
- data/lib/pulp_container_client/models/container_container_pull_through_remote_response.rb +59 -25
- data/lib/pulp_container_client/models/{container_container_pull_through_remote_response_hidden_fields.rb → container_container_pull_through_remote_response_hidden_fields_inner.rb} +37 -25
- data/lib/pulp_container_client/models/container_container_push_repository.rb +73 -63
- data/lib/pulp_container_client/models/container_container_push_repository_response.rb +88 -78
- data/lib/pulp_container_client/models/container_container_remote.rb +63 -23
- data/lib/pulp_container_client/models/container_container_remote_response.rb +61 -25
- data/lib/pulp_container_client/models/container_container_repository.rb +32 -22
- data/lib/pulp_container_client/models/container_container_repository_response.rb +34 -24
- data/lib/pulp_container_client/models/container_manifest_response.rb +42 -24
- data/lib/pulp_container_client/models/container_manifest_signature_response.rb +46 -24
- data/lib/pulp_container_client/models/container_repository_sync_url.rb +30 -22
- data/lib/pulp_container_client/models/container_tag_response.rb +36 -24
- data/lib/pulp_container_client/models/content_summary_response.rb +36 -22
- data/lib/pulp_container_client/models/manifest_copy.rb +31 -23
- data/lib/pulp_container_client/models/media_types_enum.rb +8 -4
- data/lib/pulp_container_client/models/my_permissions_response.rb +32 -22
- data/lib/pulp_container_client/models/nested_role.rb +32 -22
- data/lib/pulp_container_client/models/nested_role_response.rb +32 -22
- data/lib/pulp_container_client/models/object_roles_response.rb +32 -22
- data/lib/pulp_container_client/models/paginated_repository_version_response_list.rb +34 -22
- data/lib/pulp_container_client/models/paginatedcontainer_blob_response_list.rb +34 -22
- data/lib/pulp_container_client/models/paginatedcontainer_container_distribution_response_list.rb +34 -22
- data/lib/pulp_container_client/models/paginatedcontainer_container_namespace_response_list.rb +34 -22
- data/lib/pulp_container_client/models/paginatedcontainer_container_pull_through_distribution_response_list.rb +34 -22
- data/lib/pulp_container_client/models/paginatedcontainer_container_pull_through_remote_response_list.rb +34 -22
- data/lib/pulp_container_client/models/paginatedcontainer_container_push_repository_response_list.rb +34 -22
- data/lib/pulp_container_client/models/paginatedcontainer_container_remote_response_list.rb +34 -22
- data/lib/pulp_container_client/models/paginatedcontainer_container_repository_response_list.rb +34 -22
- data/lib/pulp_container_client/models/paginatedcontainer_manifest_response_list.rb +34 -22
- data/lib/pulp_container_client/models/paginatedcontainer_manifest_signature_response_list.rb +34 -22
- data/lib/pulp_container_client/models/paginatedcontainer_tag_response_list.rb +34 -22
- data/lib/pulp_container_client/models/patchedcontainer_container_distribution.rb +72 -56
- data/lib/pulp_container_client/models/patchedcontainer_container_pull_through_distribution.rb +72 -56
- data/lib/pulp_container_client/models/patchedcontainer_container_pull_through_remote.rb +62 -24
- data/lib/pulp_container_client/models/patchedcontainer_container_push_repository.rb +76 -64
- data/lib/pulp_container_client/models/patchedcontainer_container_remote.rb +72 -26
- data/lib/pulp_container_client/models/patchedcontainer_container_repository.rb +35 -23
- data/lib/pulp_container_client/models/policy692_enum.rb +8 -4
- data/lib/pulp_container_client/models/policy7e0_enum.rb +8 -4
- data/lib/pulp_container_client/models/recursive_manage.rb +31 -23
- data/lib/pulp_container_client/models/remove_image.rb +32 -22
- data/lib/pulp_container_client/models/remove_signatures.rb +32 -22
- data/lib/pulp_container_client/models/remove_signatures_response.rb +32 -22
- data/lib/pulp_container_client/models/repair.rb +30 -22
- data/lib/pulp_container_client/models/repository_sign.rb +36 -24
- data/lib/pulp_container_client/models/repository_version_response.rb +32 -24
- data/lib/pulp_container_client/models/set_label.rb +34 -22
- data/lib/pulp_container_client/models/set_label_response.rb +34 -22
- data/lib/pulp_container_client/models/tag_copy.rb +31 -23
- data/lib/pulp_container_client/models/tag_image.rb +34 -22
- data/lib/pulp_container_client/models/un_tag_image.rb +32 -22
- data/lib/pulp_container_client/models/unset_label.rb +32 -22
- data/lib/pulp_container_client/models/unset_label_response.rb +32 -22
- data/lib/pulp_container_client/version.rb +2 -2
- data/lib/pulp_container_client.rb +2 -3
- data/pulp_container_client.gemspec +9 -6
- data/spec/api/content_blobs_api_spec.rb +3 -3
- data/spec/api/content_manifests_api_spec.rb +3 -3
- data/spec/api/content_signatures_api_spec.rb +3 -3
- data/spec/api/content_tags_api_spec.rb +3 -3
- data/spec/api/distributions_container_api_spec.rb +13 -13
- data/spec/api/distributions_pull_through_api_spec.rb +13 -13
- data/spec/api/pulp_container_namespaces_api_spec.rb +9 -9
- data/spec/api/remotes_container_api_spec.rb +20 -19
- data/spec/api/remotes_pull_through_api_spec.rb +20 -19
- data/spec/api/repositories_container_api_spec.rb +22 -22
- data/spec/api/repositories_container_push_api_spec.rb +14 -14
- data/spec/api/repositories_container_push_versions_api_spec.rb +12 -11
- data/spec/api/repositories_container_versions_api_spec.rb +12 -11
- data/spec/api/token_api_spec.rb +2 -2
- data/spec/models/async_operation_response_spec.rb +7 -12
- data/spec/models/container_blob_response_spec.rb +12 -17
- data/spec/models/container_container_distribution_response_spec.rb +34 -39
- data/spec/models/container_container_distribution_spec.rb +20 -25
- data/spec/models/container_container_namespace_response_spec.rb +11 -16
- data/spec/models/container_container_namespace_spec.rb +7 -12
- data/spec/models/container_container_pull_through_distribution_response_spec.rb +33 -38
- data/spec/models/container_container_pull_through_distribution_spec.rb +21 -26
- data/spec/models/{container_container_pull_through_remote_response_hidden_fields_spec.rb → container_container_pull_through_remote_response_hidden_fields_inner_spec.rb} +11 -16
- data/spec/models/container_container_pull_through_remote_response_spec.rb +29 -34
- data/spec/models/container_container_pull_through_remote_spec.rb +29 -34
- data/spec/models/container_container_push_repository_response_spec.rb +27 -32
- data/spec/models/container_container_push_repository_spec.rb +16 -21
- data/spec/models/container_container_remote_response_spec.rb +31 -36
- data/spec/models/container_container_remote_spec.rb +31 -36
- data/spec/models/container_container_repository_response_spec.rb +18 -23
- data/spec/models/container_container_repository_spec.rb +12 -17
- data/spec/models/container_manifest_response_spec.rb +24 -29
- data/spec/models/container_manifest_signature_response_spec.rb +17 -22
- data/spec/models/container_repository_sync_url_spec.rb +9 -14
- data/spec/models/container_tag_response_spec.rb +12 -17
- data/spec/models/content_summary_response_spec.rb +9 -14
- data/spec/models/manifest_copy_spec.rb +10 -15
- data/spec/models/media_types_enum_spec.rb +6 -11
- data/spec/models/my_permissions_response_spec.rb +7 -12
- data/spec/models/nested_role_response_spec.rb +9 -14
- data/spec/models/nested_role_spec.rb +9 -14
- data/spec/models/object_roles_response_spec.rb +7 -12
- data/spec/models/paginated_repository_version_response_list_spec.rb +10 -15
- data/spec/models/paginatedcontainer_blob_response_list_spec.rb +10 -15
- data/spec/models/paginatedcontainer_container_distribution_response_list_spec.rb +10 -15
- data/spec/models/paginatedcontainer_container_namespace_response_list_spec.rb +10 -15
- data/spec/models/paginatedcontainer_container_pull_through_distribution_response_list_spec.rb +10 -15
- data/spec/models/paginatedcontainer_container_pull_through_remote_response_list_spec.rb +10 -15
- data/spec/models/paginatedcontainer_container_push_repository_response_list_spec.rb +10 -15
- data/spec/models/paginatedcontainer_container_remote_response_list_spec.rb +10 -15
- data/spec/models/paginatedcontainer_container_repository_response_list_spec.rb +10 -15
- data/spec/models/paginatedcontainer_manifest_response_list_spec.rb +10 -15
- data/spec/models/paginatedcontainer_manifest_signature_response_list_spec.rb +10 -15
- data/spec/models/paginatedcontainer_tag_response_list_spec.rb +10 -15
- data/spec/models/patchedcontainer_container_distribution_spec.rb +20 -25
- data/spec/models/patchedcontainer_container_pull_through_distribution_spec.rb +21 -26
- data/spec/models/patchedcontainer_container_pull_through_remote_spec.rb +29 -34
- data/spec/models/patchedcontainer_container_push_repository_spec.rb +16 -21
- data/spec/models/patchedcontainer_container_remote_spec.rb +31 -36
- data/spec/models/patchedcontainer_container_repository_spec.rb +12 -17
- data/spec/models/policy692_enum_spec.rb +6 -11
- data/spec/models/policy7e0_enum_spec.rb +6 -11
- data/spec/models/recursive_manage_spec.rb +7 -12
- data/spec/models/remove_image_spec.rb +7 -12
- data/spec/models/remove_signatures_response_spec.rb +7 -12
- data/spec/models/remove_signatures_spec.rb +7 -12
- data/spec/models/repair_spec.rb +7 -12
- data/spec/models/repository_sign_spec.rb +9 -14
- data/spec/models/repository_version_response_spec.rb +14 -19
- data/spec/models/set_label_response_spec.rb +8 -13
- data/spec/models/set_label_spec.rb +8 -13
- data/spec/models/tag_copy_spec.rb +9 -14
- data/spec/models/tag_image_spec.rb +8 -13
- data/spec/models/un_tag_image_spec.rb +7 -12
- data/spec/models/unset_label_response_spec.rb +8 -13
- data/spec/models/unset_label_spec.rb +7 -12
- data/spec/spec_helper.rb +1 -1
- metadata +105 -85
- data/docs/ContainerContainerPullThroughRemoteResponseHiddenFields.md +0 -19
- data/docs/OCIBuildImage.md +0 -23
- data/lib/pulp_container_client/models/oci_build_image.rb +0 -256
- data/spec/api_client_spec.rb +0 -188
- data/spec/configuration_spec.rb +0 -42
- data/spec/models/oci_build_image_spec.rb +0 -59
data/lib/pulp_container_client/models/container_container_pull_through_distribution_response.rb
CHANGED
@@ -6,46 +6,47 @@
|
|
6
6
|
The version of the OpenAPI document: v3
|
7
7
|
Contact: pulp-list@redhat.com
|
8
8
|
Generated by: https://openapi-generator.tech
|
9
|
-
|
9
|
+
Generator version: 7.10.0
|
10
10
|
|
11
11
|
=end
|
12
12
|
|
13
13
|
require 'date'
|
14
|
+
require 'time'
|
14
15
|
|
15
16
|
module PulpContainerClient
|
16
17
|
# A serializer for a specialized pull-through distribution referencing sub-distributions.
|
17
18
|
class ContainerContainerPullThroughDistributionResponse
|
18
|
-
# The
|
19
|
-
attr_accessor :
|
20
|
-
|
21
|
-
# Timestamp of the last time this resource was updated. Note: for immutable resources - like content, repository versions, and publication - pulp_created and pulp_last_updated dates will be the same.
|
22
|
-
attr_accessor :pulp_last_updated
|
19
|
+
# The base (relative) path component of the published url. Avoid paths that overlap with other distribution base paths (e.g. \"foo\" and \"foo/bar\")
|
20
|
+
attr_accessor :base_path
|
23
21
|
|
24
22
|
attr_accessor :pulp_labels
|
25
23
|
|
26
|
-
#
|
27
|
-
attr_accessor :
|
28
|
-
|
29
|
-
# Timestamp of creation.
|
30
|
-
attr_accessor :pulp_created
|
24
|
+
# A unique name. Ex, `rawhide` and `stable`.
|
25
|
+
attr_accessor :name
|
31
26
|
|
32
|
-
#
|
33
|
-
attr_accessor :
|
27
|
+
# Whether this distribution should be shown in the content app.
|
28
|
+
attr_accessor :hidden
|
34
29
|
|
35
30
|
# The Pulp Resource Name (PRN).
|
36
31
|
attr_accessor :prn
|
37
32
|
|
38
|
-
# Whether this distribution should be shown in the content app.
|
39
|
-
attr_accessor :hidden
|
40
|
-
|
41
33
|
attr_accessor :pulp_href
|
42
34
|
|
43
|
-
#
|
44
|
-
attr_accessor :
|
35
|
+
# An optional content-guard. If none is specified, a default one will be used.
|
36
|
+
attr_accessor :content_guard
|
45
37
|
|
46
38
|
# Timestamp since when the distributed content served by this distribution has not changed. If equals to `null`, no guarantee is provided about content changes.
|
47
39
|
attr_accessor :no_content_change_since
|
48
40
|
|
41
|
+
# Timestamp of the last time this resource was updated. Note: for immutable resources - like content, repository versions, and publication - pulp_created and pulp_last_updated dates will be the same.
|
42
|
+
attr_accessor :pulp_last_updated
|
43
|
+
|
44
|
+
# Timestamp of creation.
|
45
|
+
attr_accessor :pulp_created
|
46
|
+
|
47
|
+
# The latest RepositoryVersion for this Repository will be served.
|
48
|
+
attr_accessor :repository
|
49
|
+
|
49
50
|
# Remote that can be used to fetch content when using pull-through caching.
|
50
51
|
attr_accessor :remote
|
51
52
|
|
@@ -64,17 +65,17 @@ module PulpContainerClient
|
|
64
65
|
# Attribute mapping from ruby-style variable name to JSON key.
|
65
66
|
def self.attribute_map
|
66
67
|
{
|
67
|
-
:'repository' => :'repository',
|
68
|
-
:'pulp_last_updated' => :'pulp_last_updated',
|
69
|
-
:'pulp_labels' => :'pulp_labels',
|
70
|
-
:'content_guard' => :'content_guard',
|
71
|
-
:'pulp_created' => :'pulp_created',
|
72
68
|
:'base_path' => :'base_path',
|
73
|
-
:'
|
69
|
+
:'pulp_labels' => :'pulp_labels',
|
70
|
+
:'name' => :'name',
|
74
71
|
:'hidden' => :'hidden',
|
72
|
+
:'prn' => :'prn',
|
75
73
|
:'pulp_href' => :'pulp_href',
|
76
|
-
:'
|
74
|
+
:'content_guard' => :'content_guard',
|
77
75
|
:'no_content_change_since' => :'no_content_change_since',
|
76
|
+
:'pulp_last_updated' => :'pulp_last_updated',
|
77
|
+
:'pulp_created' => :'pulp_created',
|
78
|
+
:'repository' => :'repository',
|
78
79
|
:'remote' => :'remote',
|
79
80
|
:'distributions' => :'distributions',
|
80
81
|
:'namespace' => :'namespace',
|
@@ -83,20 +84,25 @@ module PulpContainerClient
|
|
83
84
|
}
|
84
85
|
end
|
85
86
|
|
87
|
+
# Returns all the JSON keys this model knows about
|
88
|
+
def self.acceptable_attributes
|
89
|
+
attribute_map.values
|
90
|
+
end
|
91
|
+
|
86
92
|
# Attribute type mapping.
|
87
93
|
def self.openapi_types
|
88
94
|
{
|
89
|
-
:'repository' => :'String',
|
90
|
-
:'pulp_last_updated' => :'DateTime',
|
91
|
-
:'pulp_labels' => :'Hash<String, String>',
|
92
|
-
:'content_guard' => :'String',
|
93
|
-
:'pulp_created' => :'DateTime',
|
94
95
|
:'base_path' => :'String',
|
95
|
-
:'
|
96
|
+
:'pulp_labels' => :'Hash<String, String>',
|
97
|
+
:'name' => :'String',
|
96
98
|
:'hidden' => :'Boolean',
|
99
|
+
:'prn' => :'String',
|
97
100
|
:'pulp_href' => :'String',
|
98
|
-
:'
|
101
|
+
:'content_guard' => :'String',
|
99
102
|
:'no_content_change_since' => :'String',
|
103
|
+
:'pulp_last_updated' => :'Time',
|
104
|
+
:'pulp_created' => :'Time',
|
105
|
+
:'repository' => :'String',
|
100
106
|
:'remote' => :'String',
|
101
107
|
:'distributions' => :'Array<String>',
|
102
108
|
:'namespace' => :'String',
|
@@ -128,12 +134,10 @@ module PulpContainerClient
|
|
128
134
|
h[k.to_sym] = v
|
129
135
|
}
|
130
136
|
|
131
|
-
if attributes.key?(:'
|
132
|
-
self.
|
133
|
-
|
134
|
-
|
135
|
-
if attributes.key?(:'pulp_last_updated')
|
136
|
-
self.pulp_last_updated = attributes[:'pulp_last_updated']
|
137
|
+
if attributes.key?(:'base_path')
|
138
|
+
self.base_path = attributes[:'base_path']
|
139
|
+
else
|
140
|
+
self.base_path = nil
|
137
141
|
end
|
138
142
|
|
139
143
|
if attributes.key?(:'pulp_labels')
|
@@ -142,20 +146,10 @@ module PulpContainerClient
|
|
142
146
|
end
|
143
147
|
end
|
144
148
|
|
145
|
-
if attributes.key?(:'
|
146
|
-
self.
|
147
|
-
|
148
|
-
|
149
|
-
if attributes.key?(:'pulp_created')
|
150
|
-
self.pulp_created = attributes[:'pulp_created']
|
151
|
-
end
|
152
|
-
|
153
|
-
if attributes.key?(:'base_path')
|
154
|
-
self.base_path = attributes[:'base_path']
|
155
|
-
end
|
156
|
-
|
157
|
-
if attributes.key?(:'prn')
|
158
|
-
self.prn = attributes[:'prn']
|
149
|
+
if attributes.key?(:'name')
|
150
|
+
self.name = attributes[:'name']
|
151
|
+
else
|
152
|
+
self.name = nil
|
159
153
|
end
|
160
154
|
|
161
155
|
if attributes.key?(:'hidden')
|
@@ -164,20 +158,38 @@ module PulpContainerClient
|
|
164
158
|
self.hidden = false
|
165
159
|
end
|
166
160
|
|
161
|
+
if attributes.key?(:'prn')
|
162
|
+
self.prn = attributes[:'prn']
|
163
|
+
end
|
164
|
+
|
167
165
|
if attributes.key?(:'pulp_href')
|
168
166
|
self.pulp_href = attributes[:'pulp_href']
|
169
167
|
end
|
170
168
|
|
171
|
-
if attributes.key?(:'
|
172
|
-
self.
|
169
|
+
if attributes.key?(:'content_guard')
|
170
|
+
self.content_guard = attributes[:'content_guard']
|
173
171
|
end
|
174
172
|
|
175
173
|
if attributes.key?(:'no_content_change_since')
|
176
174
|
self.no_content_change_since = attributes[:'no_content_change_since']
|
177
175
|
end
|
178
176
|
|
177
|
+
if attributes.key?(:'pulp_last_updated')
|
178
|
+
self.pulp_last_updated = attributes[:'pulp_last_updated']
|
179
|
+
end
|
180
|
+
|
181
|
+
if attributes.key?(:'pulp_created')
|
182
|
+
self.pulp_created = attributes[:'pulp_created']
|
183
|
+
end
|
184
|
+
|
185
|
+
if attributes.key?(:'repository')
|
186
|
+
self.repository = attributes[:'repository']
|
187
|
+
end
|
188
|
+
|
179
189
|
if attributes.key?(:'remote')
|
180
190
|
self.remote = attributes[:'remote']
|
191
|
+
else
|
192
|
+
self.remote = nil
|
181
193
|
end
|
182
194
|
|
183
195
|
if attributes.key?(:'distributions')
|
@@ -202,6 +214,7 @@ module PulpContainerClient
|
|
202
214
|
# Show invalid properties with the reasons. Usually used together with valid?
|
203
215
|
# @return Array for valid properties with the reasons
|
204
216
|
def list_invalid_properties
|
217
|
+
warn '[DEPRECATED] the `list_invalid_properties` method is obsolete'
|
205
218
|
invalid_properties = Array.new
|
206
219
|
if @base_path.nil?
|
207
220
|
invalid_properties.push('invalid value for "base_path", base_path cannot be nil.')
|
@@ -221,6 +234,7 @@ module PulpContainerClient
|
|
221
234
|
# Check to see if the all the properties in the model are valid
|
222
235
|
# @return true if the model is valid
|
223
236
|
def valid?
|
237
|
+
warn '[DEPRECATED] the `valid?` method is obsolete'
|
224
238
|
return false if @base_path.nil?
|
225
239
|
return false if @name.nil?
|
226
240
|
return false if @remote.nil?
|
@@ -232,17 +246,17 @@ module PulpContainerClient
|
|
232
246
|
def ==(o)
|
233
247
|
return true if self.equal?(o)
|
234
248
|
self.class == o.class &&
|
235
|
-
repository == o.repository &&
|
236
|
-
pulp_last_updated == o.pulp_last_updated &&
|
237
|
-
pulp_labels == o.pulp_labels &&
|
238
|
-
content_guard == o.content_guard &&
|
239
|
-
pulp_created == o.pulp_created &&
|
240
249
|
base_path == o.base_path &&
|
241
|
-
|
250
|
+
pulp_labels == o.pulp_labels &&
|
251
|
+
name == o.name &&
|
242
252
|
hidden == o.hidden &&
|
253
|
+
prn == o.prn &&
|
243
254
|
pulp_href == o.pulp_href &&
|
244
|
-
|
255
|
+
content_guard == o.content_guard &&
|
245
256
|
no_content_change_since == o.no_content_change_since &&
|
257
|
+
pulp_last_updated == o.pulp_last_updated &&
|
258
|
+
pulp_created == o.pulp_created &&
|
259
|
+
repository == o.repository &&
|
246
260
|
remote == o.remote &&
|
247
261
|
distributions == o.distributions &&
|
248
262
|
namespace == o.namespace &&
|
@@ -259,44 +273,40 @@ module PulpContainerClient
|
|
259
273
|
# Calculates hash code according to all attributes.
|
260
274
|
# @return [Integer] Hash code
|
261
275
|
def hash
|
262
|
-
[
|
276
|
+
[base_path, pulp_labels, name, hidden, prn, pulp_href, content_guard, no_content_change_since, pulp_last_updated, pulp_created, repository, remote, distributions, namespace, private, description].hash
|
263
277
|
end
|
264
278
|
|
265
279
|
# Builds the object from hash
|
266
280
|
# @param [Hash] attributes Model attributes in the form of hash
|
267
281
|
# @return [Object] Returns the model itself
|
268
282
|
def self.build_from_hash(attributes)
|
269
|
-
new.build_from_hash(attributes)
|
270
|
-
end
|
271
|
-
|
272
|
-
# Builds the object from hash
|
273
|
-
# @param [Hash] attributes Model attributes in the form of hash
|
274
|
-
# @return [Object] Returns the model itself
|
275
|
-
def build_from_hash(attributes)
|
276
283
|
return nil unless attributes.is_a?(Hash)
|
277
|
-
|
278
|
-
|
284
|
+
attributes = attributes.transform_keys(&:to_sym)
|
285
|
+
transformed_hash = {}
|
286
|
+
openapi_types.each_pair do |key, type|
|
287
|
+
if attributes.key?(attribute_map[key]) && attributes[attribute_map[key]].nil?
|
288
|
+
transformed_hash["#{key}"] = nil
|
289
|
+
elsif type =~ /\AArray<(.*)>/i
|
279
290
|
# check to ensure the input is an array given that the attribute
|
280
291
|
# is documented as an array but the input is not
|
281
|
-
if attributes[
|
282
|
-
|
292
|
+
if attributes[attribute_map[key]].is_a?(Array)
|
293
|
+
transformed_hash["#{key}"] = attributes[attribute_map[key]].map { |v| _deserialize($1, v) }
|
283
294
|
end
|
284
|
-
elsif !attributes[
|
285
|
-
|
286
|
-
end
|
295
|
+
elsif !attributes[attribute_map[key]].nil?
|
296
|
+
transformed_hash["#{key}"] = _deserialize(type, attributes[attribute_map[key]])
|
297
|
+
end
|
287
298
|
end
|
288
|
-
|
289
|
-
self
|
299
|
+
new(transformed_hash)
|
290
300
|
end
|
291
301
|
|
292
302
|
# Deserializes the data based on type
|
293
303
|
# @param string type Data type
|
294
304
|
# @param string value Value to be deserialized
|
295
305
|
# @return [Object] Deserialized data
|
296
|
-
def _deserialize(type, value)
|
306
|
+
def self._deserialize(type, value)
|
297
307
|
case type.to_sym
|
298
|
-
when :
|
299
|
-
|
308
|
+
when :Time
|
309
|
+
Time.parse(value)
|
300
310
|
when :Date
|
301
311
|
Date.parse(value)
|
302
312
|
when :String
|
@@ -326,7 +336,9 @@ module PulpContainerClient
|
|
326
336
|
end
|
327
337
|
end
|
328
338
|
else # model
|
329
|
-
|
339
|
+
# models (e.g. Pet) or oneOf
|
340
|
+
klass = PulpContainerClient.const_get(type)
|
341
|
+
klass.respond_to?(:openapi_any_of) || klass.respond_to?(:openapi_one_of) ? klass.build(value) : klass.build_from_hash(value)
|
330
342
|
end
|
331
343
|
end
|
332
344
|
|
@@ -352,7 +364,7 @@ module PulpContainerClient
|
|
352
364
|
is_nullable = self.class.openapi_nullable.include?(attr)
|
353
365
|
next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
|
354
366
|
end
|
355
|
-
|
367
|
+
|
356
368
|
hash[param] = _to_hash(value)
|
357
369
|
end
|
358
370
|
hash
|
@@ -375,5 +387,7 @@ module PulpContainerClient
|
|
375
387
|
value
|
376
388
|
end
|
377
389
|
end
|
390
|
+
|
378
391
|
end
|
392
|
+
|
379
393
|
end
|
@@ -6,11 +6,12 @@
|
|
6
6
|
The version of the OpenAPI document: v3
|
7
7
|
Contact: pulp-list@redhat.com
|
8
8
|
Generated by: https://openapi-generator.tech
|
9
|
-
|
9
|
+
Generator version: 7.10.0
|
10
10
|
|
11
11
|
=end
|
12
12
|
|
13
13
|
require 'date'
|
14
|
+
require 'time'
|
14
15
|
|
15
16
|
module PulpContainerClient
|
16
17
|
# A serializer for a remote used in the pull-through distribution.
|
@@ -82,6 +83,28 @@ module PulpContainerClient
|
|
82
83
|
# A list of remotes to exclude during pull-through caching. Wildcards *, ? are recognized. 'excludes' is evaluated after 'includes'.
|
83
84
|
attr_accessor :excludes
|
84
85
|
|
86
|
+
class EnumAttributeValidator
|
87
|
+
attr_reader :datatype
|
88
|
+
attr_reader :allowable_values
|
89
|
+
|
90
|
+
def initialize(datatype, allowable_values)
|
91
|
+
@allowable_values = allowable_values.map do |value|
|
92
|
+
case datatype.to_s
|
93
|
+
when /Integer/i
|
94
|
+
value.to_i
|
95
|
+
when /Float/i
|
96
|
+
value.to_f
|
97
|
+
else
|
98
|
+
value
|
99
|
+
end
|
100
|
+
end
|
101
|
+
end
|
102
|
+
|
103
|
+
def valid?(value)
|
104
|
+
!value || allowable_values.include?(value)
|
105
|
+
end
|
106
|
+
end
|
107
|
+
|
85
108
|
# Attribute mapping from ruby-style variable name to JSON key.
|
86
109
|
def self.attribute_map
|
87
110
|
{
|
@@ -111,6 +134,11 @@ module PulpContainerClient
|
|
111
134
|
}
|
112
135
|
end
|
113
136
|
|
137
|
+
# Returns all the JSON keys this model knows about
|
138
|
+
def self.acceptable_attributes
|
139
|
+
attribute_map.values
|
140
|
+
end
|
141
|
+
|
114
142
|
# Attribute type mapping.
|
115
143
|
def self.openapi_types
|
116
144
|
{
|
@@ -180,10 +208,14 @@ module PulpContainerClient
|
|
180
208
|
|
181
209
|
if attributes.key?(:'name')
|
182
210
|
self.name = attributes[:'name']
|
211
|
+
else
|
212
|
+
self.name = nil
|
183
213
|
end
|
184
214
|
|
185
215
|
if attributes.key?(:'url')
|
186
216
|
self.url = attributes[:'url']
|
217
|
+
else
|
218
|
+
self.url = nil
|
187
219
|
end
|
188
220
|
|
189
221
|
if attributes.key?(:'ca_cert')
|
@@ -282,6 +314,7 @@ module PulpContainerClient
|
|
282
314
|
# Show invalid properties with the reasons. Usually used together with valid?
|
283
315
|
# @return Array for valid properties with the reasons
|
284
316
|
def list_invalid_properties
|
317
|
+
warn '[DEPRECATED] the `list_invalid_properties` method is obsolete'
|
285
318
|
invalid_properties = Array.new
|
286
319
|
if @name.nil?
|
287
320
|
invalid_properties.push('invalid value for "name", name cannot be nil.')
|
@@ -357,6 +390,7 @@ module PulpContainerClient
|
|
357
390
|
# Check to see if the all the properties in the model are valid
|
358
391
|
# @return true if the model is valid
|
359
392
|
def valid?
|
393
|
+
warn '[DEPRECATED] the `valid?` method is obsolete'
|
360
394
|
return false if @name.nil?
|
361
395
|
return false if @name.to_s.length < 1
|
362
396
|
return false if @url.nil?
|
@@ -581,37 +615,33 @@ module PulpContainerClient
|
|
581
615
|
# @param [Hash] attributes Model attributes in the form of hash
|
582
616
|
# @return [Object] Returns the model itself
|
583
617
|
def self.build_from_hash(attributes)
|
584
|
-
new.build_from_hash(attributes)
|
585
|
-
end
|
586
|
-
|
587
|
-
# Builds the object from hash
|
588
|
-
# @param [Hash] attributes Model attributes in the form of hash
|
589
|
-
# @return [Object] Returns the model itself
|
590
|
-
def build_from_hash(attributes)
|
591
618
|
return nil unless attributes.is_a?(Hash)
|
592
|
-
|
593
|
-
|
619
|
+
attributes = attributes.transform_keys(&:to_sym)
|
620
|
+
transformed_hash = {}
|
621
|
+
openapi_types.each_pair do |key, type|
|
622
|
+
if attributes.key?(attribute_map[key]) && attributes[attribute_map[key]].nil?
|
623
|
+
transformed_hash["#{key}"] = nil
|
624
|
+
elsif type =~ /\AArray<(.*)>/i
|
594
625
|
# check to ensure the input is an array given that the attribute
|
595
626
|
# is documented as an array but the input is not
|
596
|
-
if attributes[
|
597
|
-
|
627
|
+
if attributes[attribute_map[key]].is_a?(Array)
|
628
|
+
transformed_hash["#{key}"] = attributes[attribute_map[key]].map { |v| _deserialize($1, v) }
|
598
629
|
end
|
599
|
-
elsif !attributes[
|
600
|
-
|
601
|
-
end
|
630
|
+
elsif !attributes[attribute_map[key]].nil?
|
631
|
+
transformed_hash["#{key}"] = _deserialize(type, attributes[attribute_map[key]])
|
632
|
+
end
|
602
633
|
end
|
603
|
-
|
604
|
-
self
|
634
|
+
new(transformed_hash)
|
605
635
|
end
|
606
636
|
|
607
637
|
# Deserializes the data based on type
|
608
638
|
# @param string type Data type
|
609
639
|
# @param string value Value to be deserialized
|
610
640
|
# @return [Object] Deserialized data
|
611
|
-
def _deserialize(type, value)
|
641
|
+
def self._deserialize(type, value)
|
612
642
|
case type.to_sym
|
613
|
-
when :
|
614
|
-
|
643
|
+
when :Time
|
644
|
+
Time.parse(value)
|
615
645
|
when :Date
|
616
646
|
Date.parse(value)
|
617
647
|
when :String
|
@@ -641,7 +671,9 @@ module PulpContainerClient
|
|
641
671
|
end
|
642
672
|
end
|
643
673
|
else # model
|
644
|
-
|
674
|
+
# models (e.g. Pet) or oneOf
|
675
|
+
klass = PulpContainerClient.const_get(type)
|
676
|
+
klass.respond_to?(:openapi_any_of) || klass.respond_to?(:openapi_one_of) ? klass.build(value) : klass.build_from_hash(value)
|
645
677
|
end
|
646
678
|
end
|
647
679
|
|
@@ -667,7 +699,7 @@ module PulpContainerClient
|
|
667
699
|
is_nullable = self.class.openapi_nullable.include?(attr)
|
668
700
|
next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
|
669
701
|
end
|
670
|
-
|
702
|
+
|
671
703
|
hash[param] = _to_hash(value)
|
672
704
|
end
|
673
705
|
hash
|
@@ -690,5 +722,7 @@ module PulpContainerClient
|
|
690
722
|
value
|
691
723
|
end
|
692
724
|
end
|
725
|
+
|
693
726
|
end
|
727
|
+
|
694
728
|
end
|
@@ -6,11 +6,12 @@
|
|
6
6
|
The version of the OpenAPI document: v3
|
7
7
|
Contact: pulp-list@redhat.com
|
8
8
|
Generated by: https://openapi-generator.tech
|
9
|
-
|
9
|
+
Generator version: 7.10.0
|
10
10
|
|
11
11
|
=end
|
12
12
|
|
13
13
|
require 'date'
|
14
|
+
require 'time'
|
14
15
|
|
15
16
|
module PulpContainerClient
|
16
17
|
# A serializer for a remote used in the pull-through distribution.
|
@@ -81,6 +82,28 @@ module PulpContainerClient
|
|
81
82
|
# A list of remotes to exclude during pull-through caching. Wildcards *, ? are recognized. 'excludes' is evaluated after 'includes'.
|
82
83
|
attr_accessor :excludes
|
83
84
|
|
85
|
+
class EnumAttributeValidator
|
86
|
+
attr_reader :datatype
|
87
|
+
attr_reader :allowable_values
|
88
|
+
|
89
|
+
def initialize(datatype, allowable_values)
|
90
|
+
@allowable_values = allowable_values.map do |value|
|
91
|
+
case datatype.to_s
|
92
|
+
when /Integer/i
|
93
|
+
value.to_i
|
94
|
+
when /Float/i
|
95
|
+
value.to_f
|
96
|
+
else
|
97
|
+
value
|
98
|
+
end
|
99
|
+
end
|
100
|
+
end
|
101
|
+
|
102
|
+
def valid?(value)
|
103
|
+
!value || allowable_values.include?(value)
|
104
|
+
end
|
105
|
+
end
|
106
|
+
|
84
107
|
# Attribute mapping from ruby-style variable name to JSON key.
|
85
108
|
def self.attribute_map
|
86
109
|
{
|
@@ -110,13 +133,18 @@ module PulpContainerClient
|
|
110
133
|
}
|
111
134
|
end
|
112
135
|
|
136
|
+
# Returns all the JSON keys this model knows about
|
137
|
+
def self.acceptable_attributes
|
138
|
+
attribute_map.values
|
139
|
+
end
|
140
|
+
|
113
141
|
# Attribute type mapping.
|
114
142
|
def self.openapi_types
|
115
143
|
{
|
116
144
|
:'pulp_href' => :'String',
|
117
145
|
:'prn' => :'String',
|
118
|
-
:'pulp_created' => :'
|
119
|
-
:'pulp_last_updated' => :'
|
146
|
+
:'pulp_created' => :'Time',
|
147
|
+
:'pulp_last_updated' => :'Time',
|
120
148
|
:'name' => :'String',
|
121
149
|
:'url' => :'String',
|
122
150
|
:'ca_cert' => :'String',
|
@@ -133,7 +161,7 @@ module PulpContainerClient
|
|
133
161
|
:'sock_read_timeout' => :'Float',
|
134
162
|
:'headers' => :'Array<Object>',
|
135
163
|
:'rate_limit' => :'Integer',
|
136
|
-
:'hidden_fields' => :'Array<
|
164
|
+
:'hidden_fields' => :'Array<ContainerContainerPullThroughRemoteResponseHiddenFieldsInner>',
|
137
165
|
:'includes' => :'Array<String>',
|
138
166
|
:'excludes' => :'Array<String>'
|
139
167
|
}
|
@@ -190,10 +218,14 @@ module PulpContainerClient
|
|
190
218
|
|
191
219
|
if attributes.key?(:'name')
|
192
220
|
self.name = attributes[:'name']
|
221
|
+
else
|
222
|
+
self.name = nil
|
193
223
|
end
|
194
224
|
|
195
225
|
if attributes.key?(:'url')
|
196
226
|
self.url = attributes[:'url']
|
227
|
+
else
|
228
|
+
self.url = nil
|
197
229
|
end
|
198
230
|
|
199
231
|
if attributes.key?(:'ca_cert')
|
@@ -278,6 +310,7 @@ module PulpContainerClient
|
|
278
310
|
# Show invalid properties with the reasons. Usually used together with valid?
|
279
311
|
# @return Array for valid properties with the reasons
|
280
312
|
def list_invalid_properties
|
313
|
+
warn '[DEPRECATED] the `list_invalid_properties` method is obsolete'
|
281
314
|
invalid_properties = Array.new
|
282
315
|
if @name.nil?
|
283
316
|
invalid_properties.push('invalid value for "name", name cannot be nil.')
|
@@ -313,6 +346,7 @@ module PulpContainerClient
|
|
313
346
|
# Check to see if the all the properties in the model are valid
|
314
347
|
# @return true if the model is valid
|
315
348
|
def valid?
|
349
|
+
warn '[DEPRECATED] the `valid?` method is obsolete'
|
316
350
|
return false if @name.nil?
|
317
351
|
return false if @url.nil?
|
318
352
|
return false if !@download_concurrency.nil? && @download_concurrency < 1
|
@@ -419,37 +453,33 @@ module PulpContainerClient
|
|
419
453
|
# @param [Hash] attributes Model attributes in the form of hash
|
420
454
|
# @return [Object] Returns the model itself
|
421
455
|
def self.build_from_hash(attributes)
|
422
|
-
new.build_from_hash(attributes)
|
423
|
-
end
|
424
|
-
|
425
|
-
# Builds the object from hash
|
426
|
-
# @param [Hash] attributes Model attributes in the form of hash
|
427
|
-
# @return [Object] Returns the model itself
|
428
|
-
def build_from_hash(attributes)
|
429
456
|
return nil unless attributes.is_a?(Hash)
|
430
|
-
|
431
|
-
|
457
|
+
attributes = attributes.transform_keys(&:to_sym)
|
458
|
+
transformed_hash = {}
|
459
|
+
openapi_types.each_pair do |key, type|
|
460
|
+
if attributes.key?(attribute_map[key]) && attributes[attribute_map[key]].nil?
|
461
|
+
transformed_hash["#{key}"] = nil
|
462
|
+
elsif type =~ /\AArray<(.*)>/i
|
432
463
|
# check to ensure the input is an array given that the attribute
|
433
464
|
# is documented as an array but the input is not
|
434
|
-
if attributes[
|
435
|
-
|
465
|
+
if attributes[attribute_map[key]].is_a?(Array)
|
466
|
+
transformed_hash["#{key}"] = attributes[attribute_map[key]].map { |v| _deserialize($1, v) }
|
436
467
|
end
|
437
|
-
elsif !attributes[
|
438
|
-
|
439
|
-
end
|
468
|
+
elsif !attributes[attribute_map[key]].nil?
|
469
|
+
transformed_hash["#{key}"] = _deserialize(type, attributes[attribute_map[key]])
|
470
|
+
end
|
440
471
|
end
|
441
|
-
|
442
|
-
self
|
472
|
+
new(transformed_hash)
|
443
473
|
end
|
444
474
|
|
445
475
|
# Deserializes the data based on type
|
446
476
|
# @param string type Data type
|
447
477
|
# @param string value Value to be deserialized
|
448
478
|
# @return [Object] Deserialized data
|
449
|
-
def _deserialize(type, value)
|
479
|
+
def self._deserialize(type, value)
|
450
480
|
case type.to_sym
|
451
|
-
when :
|
452
|
-
|
481
|
+
when :Time
|
482
|
+
Time.parse(value)
|
453
483
|
when :Date
|
454
484
|
Date.parse(value)
|
455
485
|
when :String
|
@@ -479,7 +509,9 @@ module PulpContainerClient
|
|
479
509
|
end
|
480
510
|
end
|
481
511
|
else # model
|
482
|
-
|
512
|
+
# models (e.g. Pet) or oneOf
|
513
|
+
klass = PulpContainerClient.const_get(type)
|
514
|
+
klass.respond_to?(:openapi_any_of) || klass.respond_to?(:openapi_one_of) ? klass.build(value) : klass.build_from_hash(value)
|
483
515
|
end
|
484
516
|
end
|
485
517
|
|
@@ -505,7 +537,7 @@ module PulpContainerClient
|
|
505
537
|
is_nullable = self.class.openapi_nullable.include?(attr)
|
506
538
|
next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
|
507
539
|
end
|
508
|
-
|
540
|
+
|
509
541
|
hash[param] = _to_hash(value)
|
510
542
|
end
|
511
543
|
hash
|
@@ -528,5 +560,7 @@ module PulpContainerClient
|
|
528
560
|
value
|
529
561
|
end
|
530
562
|
end
|
563
|
+
|
531
564
|
end
|
565
|
+
|
532
566
|
end
|