pulp_container_client 2.22.1 → 2.23.0
Sign up to get free protection for your applications and to get access to all the features.
- 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 +86 -74
- 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 +88 -74
- 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 +83 -73
- data/lib/pulp_container_client/models/container_container_push_repository_response.rb +91 -81
- 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 +81 -65
- data/lib/pulp_container_client/models/patchedcontainer_container_pull_through_distribution.rb +81 -65
- 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 +77 -65
- 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 +28 -33
- data/spec/models/container_container_push_repository_spec.rb +15 -20
- 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 +15 -20
- 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
@@ -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 parsing and validating data associated with a manifest tagging.
|
@@ -29,6 +30,11 @@ module PulpContainerClient
|
|
29
30
|
}
|
30
31
|
end
|
31
32
|
|
33
|
+
# Returns all the JSON keys this model knows about
|
34
|
+
def self.acceptable_attributes
|
35
|
+
attribute_map.values
|
36
|
+
end
|
37
|
+
|
32
38
|
# Attribute type mapping.
|
33
39
|
def self.openapi_types
|
34
40
|
{
|
@@ -60,16 +66,21 @@ module PulpContainerClient
|
|
60
66
|
|
61
67
|
if attributes.key?(:'tag')
|
62
68
|
self.tag = attributes[:'tag']
|
69
|
+
else
|
70
|
+
self.tag = nil
|
63
71
|
end
|
64
72
|
|
65
73
|
if attributes.key?(:'digest')
|
66
74
|
self.digest = attributes[:'digest']
|
75
|
+
else
|
76
|
+
self.digest = nil
|
67
77
|
end
|
68
78
|
end
|
69
79
|
|
70
80
|
# Show invalid properties with the reasons. Usually used together with valid?
|
71
81
|
# @return Array for valid properties with the reasons
|
72
82
|
def list_invalid_properties
|
83
|
+
warn '[DEPRECATED] the `list_invalid_properties` method is obsolete'
|
73
84
|
invalid_properties = Array.new
|
74
85
|
if @tag.nil?
|
75
86
|
invalid_properties.push('invalid value for "tag", tag cannot be nil.')
|
@@ -98,6 +109,7 @@ module PulpContainerClient
|
|
98
109
|
# Check to see if the all the properties in the model are valid
|
99
110
|
# @return true if the model is valid
|
100
111
|
def valid?
|
112
|
+
warn '[DEPRECATED] the `valid?` method is obsolete'
|
101
113
|
return false if @tag.nil?
|
102
114
|
return false if @tag.to_s.length < 1
|
103
115
|
return false if @tag !~ Regexp.new(/^[A-Za-z0-9][A-Za-z0-9._-]*$/)
|
@@ -164,37 +176,33 @@ module PulpContainerClient
|
|
164
176
|
# @param [Hash] attributes Model attributes in the form of hash
|
165
177
|
# @return [Object] Returns the model itself
|
166
178
|
def self.build_from_hash(attributes)
|
167
|
-
new.build_from_hash(attributes)
|
168
|
-
end
|
169
|
-
|
170
|
-
# Builds the object from hash
|
171
|
-
# @param [Hash] attributes Model attributes in the form of hash
|
172
|
-
# @return [Object] Returns the model itself
|
173
|
-
def build_from_hash(attributes)
|
174
179
|
return nil unless attributes.is_a?(Hash)
|
175
|
-
|
176
|
-
|
180
|
+
attributes = attributes.transform_keys(&:to_sym)
|
181
|
+
transformed_hash = {}
|
182
|
+
openapi_types.each_pair do |key, type|
|
183
|
+
if attributes.key?(attribute_map[key]) && attributes[attribute_map[key]].nil?
|
184
|
+
transformed_hash["#{key}"] = nil
|
185
|
+
elsif type =~ /\AArray<(.*)>/i
|
177
186
|
# check to ensure the input is an array given that the attribute
|
178
187
|
# is documented as an array but the input is not
|
179
|
-
if attributes[
|
180
|
-
|
188
|
+
if attributes[attribute_map[key]].is_a?(Array)
|
189
|
+
transformed_hash["#{key}"] = attributes[attribute_map[key]].map { |v| _deserialize($1, v) }
|
181
190
|
end
|
182
|
-
elsif !attributes[
|
183
|
-
|
184
|
-
end
|
191
|
+
elsif !attributes[attribute_map[key]].nil?
|
192
|
+
transformed_hash["#{key}"] = _deserialize(type, attributes[attribute_map[key]])
|
193
|
+
end
|
185
194
|
end
|
186
|
-
|
187
|
-
self
|
195
|
+
new(transformed_hash)
|
188
196
|
end
|
189
197
|
|
190
198
|
# Deserializes the data based on type
|
191
199
|
# @param string type Data type
|
192
200
|
# @param string value Value to be deserialized
|
193
201
|
# @return [Object] Deserialized data
|
194
|
-
def _deserialize(type, value)
|
202
|
+
def self._deserialize(type, value)
|
195
203
|
case type.to_sym
|
196
|
-
when :
|
197
|
-
|
204
|
+
when :Time
|
205
|
+
Time.parse(value)
|
198
206
|
when :Date
|
199
207
|
Date.parse(value)
|
200
208
|
when :String
|
@@ -224,7 +232,9 @@ module PulpContainerClient
|
|
224
232
|
end
|
225
233
|
end
|
226
234
|
else # model
|
227
|
-
|
235
|
+
# models (e.g. Pet) or oneOf
|
236
|
+
klass = PulpContainerClient.const_get(type)
|
237
|
+
klass.respond_to?(:openapi_any_of) || klass.respond_to?(:openapi_one_of) ? klass.build(value) : klass.build_from_hash(value)
|
228
238
|
end
|
229
239
|
end
|
230
240
|
|
@@ -250,7 +260,7 @@ module PulpContainerClient
|
|
250
260
|
is_nullable = self.class.openapi_nullable.include?(attr)
|
251
261
|
next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
|
252
262
|
end
|
253
|
-
|
263
|
+
|
254
264
|
hash[param] = _to_hash(value)
|
255
265
|
end
|
256
266
|
hash
|
@@ -273,5 +283,7 @@ module PulpContainerClient
|
|
273
283
|
value
|
274
284
|
end
|
275
285
|
end
|
286
|
+
|
276
287
|
end
|
288
|
+
|
277
289
|
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 parsing and validating data associated with a manifest untagging.
|
@@ -25,6 +26,11 @@ module PulpContainerClient
|
|
25
26
|
}
|
26
27
|
end
|
27
28
|
|
29
|
+
# Returns all the JSON keys this model knows about
|
30
|
+
def self.acceptable_attributes
|
31
|
+
attribute_map.values
|
32
|
+
end
|
33
|
+
|
28
34
|
# Attribute type mapping.
|
29
35
|
def self.openapi_types
|
30
36
|
{
|
@@ -55,12 +61,15 @@ module PulpContainerClient
|
|
55
61
|
|
56
62
|
if attributes.key?(:'tag')
|
57
63
|
self.tag = attributes[:'tag']
|
64
|
+
else
|
65
|
+
self.tag = nil
|
58
66
|
end
|
59
67
|
end
|
60
68
|
|
61
69
|
# Show invalid properties with the reasons. Usually used together with valid?
|
62
70
|
# @return Array for valid properties with the reasons
|
63
71
|
def list_invalid_properties
|
72
|
+
warn '[DEPRECATED] the `list_invalid_properties` method is obsolete'
|
64
73
|
invalid_properties = Array.new
|
65
74
|
if @tag.nil?
|
66
75
|
invalid_properties.push('invalid value for "tag", tag cannot be nil.')
|
@@ -81,6 +90,7 @@ module PulpContainerClient
|
|
81
90
|
# Check to see if the all the properties in the model are valid
|
82
91
|
# @return true if the model is valid
|
83
92
|
def valid?
|
93
|
+
warn '[DEPRECATED] the `valid?` method is obsolete'
|
84
94
|
return false if @tag.nil?
|
85
95
|
return false if @tag.to_s.length < 1
|
86
96
|
return false if @tag !~ Regexp.new(/^[A-Za-z0-9][A-Za-z0-9._-]*$/)
|
@@ -130,37 +140,33 @@ module PulpContainerClient
|
|
130
140
|
# @param [Hash] attributes Model attributes in the form of hash
|
131
141
|
# @return [Object] Returns the model itself
|
132
142
|
def self.build_from_hash(attributes)
|
133
|
-
new.build_from_hash(attributes)
|
134
|
-
end
|
135
|
-
|
136
|
-
# Builds the object from hash
|
137
|
-
# @param [Hash] attributes Model attributes in the form of hash
|
138
|
-
# @return [Object] Returns the model itself
|
139
|
-
def build_from_hash(attributes)
|
140
143
|
return nil unless attributes.is_a?(Hash)
|
141
|
-
|
142
|
-
|
144
|
+
attributes = attributes.transform_keys(&:to_sym)
|
145
|
+
transformed_hash = {}
|
146
|
+
openapi_types.each_pair do |key, type|
|
147
|
+
if attributes.key?(attribute_map[key]) && attributes[attribute_map[key]].nil?
|
148
|
+
transformed_hash["#{key}"] = nil
|
149
|
+
elsif type =~ /\AArray<(.*)>/i
|
143
150
|
# check to ensure the input is an array given that the attribute
|
144
151
|
# is documented as an array but the input is not
|
145
|
-
if attributes[
|
146
|
-
|
152
|
+
if attributes[attribute_map[key]].is_a?(Array)
|
153
|
+
transformed_hash["#{key}"] = attributes[attribute_map[key]].map { |v| _deserialize($1, v) }
|
147
154
|
end
|
148
|
-
elsif !attributes[
|
149
|
-
|
150
|
-
end
|
155
|
+
elsif !attributes[attribute_map[key]].nil?
|
156
|
+
transformed_hash["#{key}"] = _deserialize(type, attributes[attribute_map[key]])
|
157
|
+
end
|
151
158
|
end
|
152
|
-
|
153
|
-
self
|
159
|
+
new(transformed_hash)
|
154
160
|
end
|
155
161
|
|
156
162
|
# Deserializes the data based on type
|
157
163
|
# @param string type Data type
|
158
164
|
# @param string value Value to be deserialized
|
159
165
|
# @return [Object] Deserialized data
|
160
|
-
def _deserialize(type, value)
|
166
|
+
def self._deserialize(type, value)
|
161
167
|
case type.to_sym
|
162
|
-
when :
|
163
|
-
|
168
|
+
when :Time
|
169
|
+
Time.parse(value)
|
164
170
|
when :Date
|
165
171
|
Date.parse(value)
|
166
172
|
when :String
|
@@ -190,7 +196,9 @@ module PulpContainerClient
|
|
190
196
|
end
|
191
197
|
end
|
192
198
|
else # model
|
193
|
-
|
199
|
+
# models (e.g. Pet) or oneOf
|
200
|
+
klass = PulpContainerClient.const_get(type)
|
201
|
+
klass.respond_to?(:openapi_any_of) || klass.respond_to?(:openapi_one_of) ? klass.build(value) : klass.build_from_hash(value)
|
194
202
|
end
|
195
203
|
end
|
196
204
|
|
@@ -216,7 +224,7 @@ module PulpContainerClient
|
|
216
224
|
is_nullable = self.class.openapi_nullable.include?(attr)
|
217
225
|
next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
|
218
226
|
end
|
219
|
-
|
227
|
+
|
220
228
|
hash[param] = _to_hash(value)
|
221
229
|
end
|
222
230
|
hash
|
@@ -239,5 +247,7 @@ module PulpContainerClient
|
|
239
247
|
value
|
240
248
|
end
|
241
249
|
end
|
250
|
+
|
242
251
|
end
|
252
|
+
|
243
253
|
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
|
# Serializer for synchronously setting a label.
|
@@ -24,6 +25,11 @@ module PulpContainerClient
|
|
24
25
|
}
|
25
26
|
end
|
26
27
|
|
28
|
+
# Returns all the JSON keys this model knows about
|
29
|
+
def self.acceptable_attributes
|
30
|
+
attribute_map.values
|
31
|
+
end
|
32
|
+
|
27
33
|
# Attribute type mapping.
|
28
34
|
def self.openapi_types
|
29
35
|
{
|
@@ -54,12 +60,15 @@ module PulpContainerClient
|
|
54
60
|
|
55
61
|
if attributes.key?(:'key')
|
56
62
|
self.key = attributes[:'key']
|
63
|
+
else
|
64
|
+
self.key = nil
|
57
65
|
end
|
58
66
|
end
|
59
67
|
|
60
68
|
# Show invalid properties with the reasons. Usually used together with valid?
|
61
69
|
# @return Array for valid properties with the reasons
|
62
70
|
def list_invalid_properties
|
71
|
+
warn '[DEPRECATED] the `list_invalid_properties` method is obsolete'
|
63
72
|
invalid_properties = Array.new
|
64
73
|
if @key.nil?
|
65
74
|
invalid_properties.push('invalid value for "key", key cannot be nil.')
|
@@ -80,6 +89,7 @@ module PulpContainerClient
|
|
80
89
|
# Check to see if the all the properties in the model are valid
|
81
90
|
# @return true if the model is valid
|
82
91
|
def valid?
|
92
|
+
warn '[DEPRECATED] the `valid?` method is obsolete'
|
83
93
|
return false if @key.nil?
|
84
94
|
return false if @key.to_s.length < 1
|
85
95
|
return false if @key !~ Regexp.new(/^[-a-zA-Z0-9_]+$/)
|
@@ -129,37 +139,33 @@ module PulpContainerClient
|
|
129
139
|
# @param [Hash] attributes Model attributes in the form of hash
|
130
140
|
# @return [Object] Returns the model itself
|
131
141
|
def self.build_from_hash(attributes)
|
132
|
-
new.build_from_hash(attributes)
|
133
|
-
end
|
134
|
-
|
135
|
-
# Builds the object from hash
|
136
|
-
# @param [Hash] attributes Model attributes in the form of hash
|
137
|
-
# @return [Object] Returns the model itself
|
138
|
-
def build_from_hash(attributes)
|
139
142
|
return nil unless attributes.is_a?(Hash)
|
140
|
-
|
141
|
-
|
143
|
+
attributes = attributes.transform_keys(&:to_sym)
|
144
|
+
transformed_hash = {}
|
145
|
+
openapi_types.each_pair do |key, type|
|
146
|
+
if attributes.key?(attribute_map[key]) && attributes[attribute_map[key]].nil?
|
147
|
+
transformed_hash["#{key}"] = nil
|
148
|
+
elsif type =~ /\AArray<(.*)>/i
|
142
149
|
# check to ensure the input is an array given that the attribute
|
143
150
|
# is documented as an array but the input is not
|
144
|
-
if attributes[
|
145
|
-
|
151
|
+
if attributes[attribute_map[key]].is_a?(Array)
|
152
|
+
transformed_hash["#{key}"] = attributes[attribute_map[key]].map { |v| _deserialize($1, v) }
|
146
153
|
end
|
147
|
-
elsif !attributes[
|
148
|
-
|
149
|
-
end
|
154
|
+
elsif !attributes[attribute_map[key]].nil?
|
155
|
+
transformed_hash["#{key}"] = _deserialize(type, attributes[attribute_map[key]])
|
156
|
+
end
|
150
157
|
end
|
151
|
-
|
152
|
-
self
|
158
|
+
new(transformed_hash)
|
153
159
|
end
|
154
160
|
|
155
161
|
# Deserializes the data based on type
|
156
162
|
# @param string type Data type
|
157
163
|
# @param string value Value to be deserialized
|
158
164
|
# @return [Object] Deserialized data
|
159
|
-
def _deserialize(type, value)
|
165
|
+
def self._deserialize(type, value)
|
160
166
|
case type.to_sym
|
161
|
-
when :
|
162
|
-
|
167
|
+
when :Time
|
168
|
+
Time.parse(value)
|
163
169
|
when :Date
|
164
170
|
Date.parse(value)
|
165
171
|
when :String
|
@@ -189,7 +195,9 @@ module PulpContainerClient
|
|
189
195
|
end
|
190
196
|
end
|
191
197
|
else # model
|
192
|
-
|
198
|
+
# models (e.g. Pet) or oneOf
|
199
|
+
klass = PulpContainerClient.const_get(type)
|
200
|
+
klass.respond_to?(:openapi_any_of) || klass.respond_to?(:openapi_one_of) ? klass.build(value) : klass.build_from_hash(value)
|
193
201
|
end
|
194
202
|
end
|
195
203
|
|
@@ -215,7 +223,7 @@ module PulpContainerClient
|
|
215
223
|
is_nullable = self.class.openapi_nullable.include?(attr)
|
216
224
|
next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
|
217
225
|
end
|
218
|
-
|
226
|
+
|
219
227
|
hash[param] = _to_hash(value)
|
220
228
|
end
|
221
229
|
hash
|
@@ -238,5 +246,7 @@ module PulpContainerClient
|
|
238
246
|
value
|
239
247
|
end
|
240
248
|
end
|
249
|
+
|
241
250
|
end
|
251
|
+
|
242
252
|
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
|
# Serializer for synchronously setting a label.
|
@@ -27,6 +28,11 @@ module PulpContainerClient
|
|
27
28
|
}
|
28
29
|
end
|
29
30
|
|
31
|
+
# Returns all the JSON keys this model knows about
|
32
|
+
def self.acceptable_attributes
|
33
|
+
attribute_map.values
|
34
|
+
end
|
35
|
+
|
30
36
|
# Attribute type mapping.
|
31
37
|
def self.openapi_types
|
32
38
|
{
|
@@ -58,6 +64,8 @@ module PulpContainerClient
|
|
58
64
|
|
59
65
|
if attributes.key?(:'key')
|
60
66
|
self.key = attributes[:'key']
|
67
|
+
else
|
68
|
+
self.key = nil
|
61
69
|
end
|
62
70
|
|
63
71
|
if attributes.key?(:'value')
|
@@ -68,6 +76,7 @@ module PulpContainerClient
|
|
68
76
|
# Show invalid properties with the reasons. Usually used together with valid?
|
69
77
|
# @return Array for valid properties with the reasons
|
70
78
|
def list_invalid_properties
|
79
|
+
warn '[DEPRECATED] the `list_invalid_properties` method is obsolete'
|
71
80
|
invalid_properties = Array.new
|
72
81
|
if @key.nil?
|
73
82
|
invalid_properties.push('invalid value for "key", key cannot be nil.')
|
@@ -84,6 +93,7 @@ module PulpContainerClient
|
|
84
93
|
# Check to see if the all the properties in the model are valid
|
85
94
|
# @return true if the model is valid
|
86
95
|
def valid?
|
96
|
+
warn '[DEPRECATED] the `valid?` method is obsolete'
|
87
97
|
return false if @key.nil?
|
88
98
|
return false if @key !~ Regexp.new(/^[-a-zA-Z0-9_]+$/)
|
89
99
|
true
|
@@ -129,37 +139,33 @@ module PulpContainerClient
|
|
129
139
|
# @param [Hash] attributes Model attributes in the form of hash
|
130
140
|
# @return [Object] Returns the model itself
|
131
141
|
def self.build_from_hash(attributes)
|
132
|
-
new.build_from_hash(attributes)
|
133
|
-
end
|
134
|
-
|
135
|
-
# Builds the object from hash
|
136
|
-
# @param [Hash] attributes Model attributes in the form of hash
|
137
|
-
# @return [Object] Returns the model itself
|
138
|
-
def build_from_hash(attributes)
|
139
142
|
return nil unless attributes.is_a?(Hash)
|
140
|
-
|
141
|
-
|
143
|
+
attributes = attributes.transform_keys(&:to_sym)
|
144
|
+
transformed_hash = {}
|
145
|
+
openapi_types.each_pair do |key, type|
|
146
|
+
if attributes.key?(attribute_map[key]) && attributes[attribute_map[key]].nil?
|
147
|
+
transformed_hash["#{key}"] = nil
|
148
|
+
elsif type =~ /\AArray<(.*)>/i
|
142
149
|
# check to ensure the input is an array given that the attribute
|
143
150
|
# is documented as an array but the input is not
|
144
|
-
if attributes[
|
145
|
-
|
151
|
+
if attributes[attribute_map[key]].is_a?(Array)
|
152
|
+
transformed_hash["#{key}"] = attributes[attribute_map[key]].map { |v| _deserialize($1, v) }
|
146
153
|
end
|
147
|
-
elsif !attributes[
|
148
|
-
|
149
|
-
end
|
154
|
+
elsif !attributes[attribute_map[key]].nil?
|
155
|
+
transformed_hash["#{key}"] = _deserialize(type, attributes[attribute_map[key]])
|
156
|
+
end
|
150
157
|
end
|
151
|
-
|
152
|
-
self
|
158
|
+
new(transformed_hash)
|
153
159
|
end
|
154
160
|
|
155
161
|
# Deserializes the data based on type
|
156
162
|
# @param string type Data type
|
157
163
|
# @param string value Value to be deserialized
|
158
164
|
# @return [Object] Deserialized data
|
159
|
-
def _deserialize(type, value)
|
165
|
+
def self._deserialize(type, value)
|
160
166
|
case type.to_sym
|
161
|
-
when :
|
162
|
-
|
167
|
+
when :Time
|
168
|
+
Time.parse(value)
|
163
169
|
when :Date
|
164
170
|
Date.parse(value)
|
165
171
|
when :String
|
@@ -189,7 +195,9 @@ module PulpContainerClient
|
|
189
195
|
end
|
190
196
|
end
|
191
197
|
else # model
|
192
|
-
|
198
|
+
# models (e.g. Pet) or oneOf
|
199
|
+
klass = PulpContainerClient.const_get(type)
|
200
|
+
klass.respond_to?(:openapi_any_of) || klass.respond_to?(:openapi_one_of) ? klass.build(value) : klass.build_from_hash(value)
|
193
201
|
end
|
194
202
|
end
|
195
203
|
|
@@ -215,7 +223,7 @@ module PulpContainerClient
|
|
215
223
|
is_nullable = self.class.openapi_nullable.include?(attr)
|
216
224
|
next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
|
217
225
|
end
|
218
|
-
|
226
|
+
|
219
227
|
hash[param] = _to_hash(value)
|
220
228
|
end
|
221
229
|
hash
|
@@ -238,5 +246,7 @@ module PulpContainerClient
|
|
238
246
|
value
|
239
247
|
end
|
240
248
|
end
|
249
|
+
|
241
250
|
end
|
251
|
+
|
242
252
|
end
|
@@ -6,10 +6,10 @@
|
|
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
|
module PulpContainerClient
|
14
|
-
VERSION = '2.
|
14
|
+
VERSION = '2.23.0'
|
15
15
|
end
|
@@ -6,7 +6,7 @@
|
|
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
|
|
@@ -27,7 +27,7 @@ require 'pulp_container_client/models/container_container_pull_through_distribut
|
|
27
27
|
require 'pulp_container_client/models/container_container_pull_through_distribution_response'
|
28
28
|
require 'pulp_container_client/models/container_container_pull_through_remote'
|
29
29
|
require 'pulp_container_client/models/container_container_pull_through_remote_response'
|
30
|
-
require 'pulp_container_client/models/
|
30
|
+
require 'pulp_container_client/models/container_container_pull_through_remote_response_hidden_fields_inner'
|
31
31
|
require 'pulp_container_client/models/container_container_push_repository'
|
32
32
|
require 'pulp_container_client/models/container_container_push_repository_response'
|
33
33
|
require 'pulp_container_client/models/container_container_remote'
|
@@ -44,7 +44,6 @@ require 'pulp_container_client/models/media_types_enum'
|
|
44
44
|
require 'pulp_container_client/models/my_permissions_response'
|
45
45
|
require 'pulp_container_client/models/nested_role'
|
46
46
|
require 'pulp_container_client/models/nested_role_response'
|
47
|
-
require 'pulp_container_client/models/oci_build_image'
|
48
47
|
require 'pulp_container_client/models/object_roles_response'
|
49
48
|
require 'pulp_container_client/models/paginated_repository_version_response_list'
|
50
49
|
require 'pulp_container_client/models/paginatedcontainer_blob_response_list'
|
@@ -8,7 +8,7 @@
|
|
8
8
|
The version of the OpenAPI document: v3
|
9
9
|
Contact: pulp-list@redhat.com
|
10
10
|
Generated by: https://openapi-generator.tech
|
11
|
-
|
11
|
+
Generator version: 7.10.0
|
12
12
|
|
13
13
|
=end
|
14
14
|
|
@@ -24,11 +24,14 @@ Gem::Specification.new do |s|
|
|
24
24
|
s.homepage = "https://github.com/pulp/pulp_container"
|
25
25
|
s.summary = "Pulp 3 API Ruby Gem"
|
26
26
|
s.description = "Fetch, Upload, Organize, and Distribute Software Packages"
|
27
|
-
s.license =
|
28
|
-
s.required_ruby_version = ">=
|
29
|
-
|
30
|
-
|
31
|
-
s.add_runtime_dependency '
|
27
|
+
s.license = "GPLv2+"
|
28
|
+
s.required_ruby_version = ">= 2.7"
|
29
|
+
s.metadata = {}
|
30
|
+
|
31
|
+
s.add_runtime_dependency 'faraday-net_http', '>= 2.0', '< 3.1'
|
32
|
+
s.add_runtime_dependency 'faraday', '>= 1.0.1', '< 2.9'
|
33
|
+
s.add_runtime_dependency 'faraday-multipart'
|
34
|
+
s.add_runtime_dependency 'marcel'
|
32
35
|
|
33
36
|
s.add_development_dependency 'rspec', '~> 3.6', '>= 3.6.0'
|
34
37
|
|
@@ -6,7 +6,7 @@
|
|
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
|
|
@@ -54,7 +54,7 @@ describe 'ContentBlobsApi' do
|
|
54
54
|
# @return [PaginatedcontainerBlobResponseList]
|
55
55
|
describe 'list test' do
|
56
56
|
it 'should work' do
|
57
|
-
# assertion here. ref: https://
|
57
|
+
# assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/
|
58
58
|
end
|
59
59
|
end
|
60
60
|
|
@@ -68,7 +68,7 @@ describe 'ContentBlobsApi' do
|
|
68
68
|
# @return [ContainerBlobResponse]
|
69
69
|
describe 'read test' do
|
70
70
|
it 'should work' do
|
71
|
-
# assertion here. ref: https://
|
71
|
+
# assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/
|
72
72
|
end
|
73
73
|
end
|
74
74
|
|
@@ -6,7 +6,7 @@
|
|
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
|
|
@@ -57,7 +57,7 @@ describe 'ContentManifestsApi' do
|
|
57
57
|
# @return [PaginatedcontainerManifestResponseList]
|
58
58
|
describe 'list test' do
|
59
59
|
it 'should work' do
|
60
|
-
# assertion here. ref: https://
|
60
|
+
# assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/
|
61
61
|
end
|
62
62
|
end
|
63
63
|
|
@@ -71,7 +71,7 @@ describe 'ContentManifestsApi' do
|
|
71
71
|
# @return [ContainerManifestResponse]
|
72
72
|
describe 'read test' do
|
73
73
|
it 'should work' do
|
74
|
-
# assertion here. ref: https://
|
74
|
+
# assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/
|
75
75
|
end
|
76
76
|
end
|
77
77
|
|
@@ -6,7 +6,7 @@
|
|
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
|
|
@@ -66,7 +66,7 @@ describe 'ContentSignaturesApi' do
|
|
66
66
|
# @return [PaginatedcontainerManifestSignatureResponseList]
|
67
67
|
describe 'list test' do
|
68
68
|
it 'should work' do
|
69
|
-
# assertion here. ref: https://
|
69
|
+
# assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/
|
70
70
|
end
|
71
71
|
end
|
72
72
|
|
@@ -80,7 +80,7 @@ describe 'ContentSignaturesApi' do
|
|
80
80
|
# @return [ContainerManifestSignatureResponse]
|
81
81
|
describe 'read test' do
|
82
82
|
it 'should work' do
|
83
|
-
# assertion here. ref: https://
|
83
|
+
# assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/
|
84
84
|
end
|
85
85
|
end
|
86
86
|
|