pulp_container_client 2.5.2 → 2.6.0

data/lib/pulp_container_client/models/container_container_repository_response.rb

@@ -32,6 +32,9 @@ module PulpContainerClient
     # An optional description.
     attr_accessor :description
 
+    # Retain X versions of the repository. Default is null which retains all versions. This is provided as a tech preview in Pulp 3 and may change in the future.
+    attr_accessor :retained_versions
+
     attr_accessor :remote
 
     # Attribute mapping from ruby-style variable name to JSON key.
@@ -44,6 +47,7 @@ module PulpContainerClient
         :'latest_version_href' => :'latest_version_href',
         :'name' => :'name',
         :'description' => :'description',
+        :'retained_versions' => :'retained_versions',
         :'remote' => :'remote'
       }
     end
@@ -58,6 +62,7 @@ module PulpContainerClient
         :'latest_version_href' => :'String',
         :'name' => :'String',
         :'description' => :'String',
+        :'retained_versions' => :'Integer',
         :'remote' => :'String'
       }
     end
@@ -66,6 +71,7 @@ module PulpContainerClient
     def self.openapi_nullable
       Set.new([
         :'description',
+        :'retained_versions',
         :'remote'
       ])
     end
@@ -113,6 +119,10 @@ module PulpContainerClient
         self.description = attributes[:'description']
       end
 
+      if attributes.key?(:'retained_versions')
+        self.retained_versions = attributes[:'retained_versions']
+      end
+
       if attributes.key?(:'remote')
         self.remote = attributes[:'remote']
       end
@@ -126,6 +136,10 @@ module PulpContainerClient
         invalid_properties.push('invalid value for "name", name cannot be nil.')
       end
 
+      if !@retained_versions.nil? && @retained_versions < 1
+        invalid_properties.push('invalid value for "retained_versions", must be greater than or equal to 1.')
+      end
+
       invalid_properties
     end
 
@@ -133,9 +147,20 @@ module PulpContainerClient
     # @return true if the model is valid
     def valid?
       return false if @name.nil?
+      return false if !@retained_versions.nil? && @retained_versions < 1
       true
     end
 
+    # Custom attribute writer method with validation
+    # @param [Object] retained_versions Value to be assigned
+    def retained_versions=(retained_versions)
+      if !retained_versions.nil? && retained_versions < 1
+        fail ArgumentError, 'invalid value for "retained_versions", must be greater than or equal to 1.'
+      end
+
+      @retained_versions = retained_versions
+    end
+
     # Checks equality by comparing each attribute.
     # @param [Object] Object to be compared
     def ==(o)
@@ -148,6 +173,7 @@ module PulpContainerClient
           latest_version_href == o.latest_version_href &&
           name == o.name &&
           description == o.description &&
+          retained_versions == o.retained_versions &&
           remote == o.remote
     end
 
@@ -160,7 +186,7 @@ module PulpContainerClient
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [pulp_href, pulp_created, versions_href, pulp_labels, latest_version_href, name, description, remote].hash
+      [pulp_href, pulp_created, versions_href, pulp_labels, latest_version_href, name, description, retained_versions, remote].hash
     end
 
     # Builds the object from hash

data/lib/pulp_container_client/models/content_summary.rb

@@ -33,9 +33,9 @@ module PulpContainerClient
     # Attribute type mapping.
     def self.openapi_types
       {
-        :'added' => :'Object',
-        :'removed' => :'Object',
-        :'present' => :'Object'
+        :'added' => :'Hash<String, Object>',
+        :'removed' => :'Hash<String, Object>',
+        :'present' => :'Hash<String, Object>'
       }
     end
 
@@ -61,15 +61,21 @@ module PulpContainerClient
       }
 
       if attributes.key?(:'added')
-        self.added = attributes[:'added']
+        if (value = attributes[:'added']).is_a?(Hash)
+          self.added = value
+        end
       end
 
       if attributes.key?(:'removed')
-        self.removed = attributes[:'removed']
+        if (value = attributes[:'removed']).is_a?(Hash)
+          self.removed = value
+        end
       end
 
       if attributes.key?(:'present')
-        self.present = attributes[:'present']
+        if (value = attributes[:'present']).is_a?(Hash)
+          self.present = value
+        end
       end
     end
 

data/lib/pulp_container_client/models/content_summary_response.rb

@@ -33,9 +33,9 @@ module PulpContainerClient
     # Attribute type mapping.
     def self.openapi_types
       {
-        :'added' => :'Object',
-        :'removed' => :'Object',
-        :'present' => :'Object'
+        :'added' => :'Hash<String, Object>',
+        :'removed' => :'Hash<String, Object>',
+        :'present' => :'Hash<String, Object>'
       }
     end
 
@@ -61,15 +61,21 @@ module PulpContainerClient
       }
 
       if attributes.key?(:'added')
-        self.added = attributes[:'added']
+        if (value = attributes[:'added']).is_a?(Hash)
+          self.added = value
+        end
       end
 
       if attributes.key?(:'removed')
-        self.removed = attributes[:'removed']
+        if (value = attributes[:'removed']).is_a?(Hash)
+          self.removed = value
+        end
       end
 
       if attributes.key?(:'present')
-        self.present = attributes[:'present']
+        if (value = attributes[:'present']).is_a?(Hash)
+          self.present = value
+        end
       end
     end
 

data/lib/pulp_container_client/models/patchedcontainer_container_distribution.rb

@@ -15,8 +15,10 @@ require 'date'
 module PulpContainerClient
   # A serializer for ContainerDistribution.
   class PatchedcontainerContainerDistribution
-    # The base (relative) path component of the published url. Avoid paths that                     overlap with other distribution base paths (e.g. \"foo\" and \"foo/bar\")
-    attr_accessor :base_path
+    # The latest RepositoryVersion for this Repository will be served.
+    attr_accessor :repository
+
+    attr_accessor :pulp_labels
 
     # A unique name. Ex, `rawhide` and `stable`.
     attr_accessor :name
@@ -24,14 +26,12 @@ module PulpContainerClient
     # An optional content-guard. If none is specified, a default one will be used.
     attr_accessor :content_guard
 
+    # The base (relative) path component of the published url. Avoid paths that                     overlap with other distribution base paths (e.g. \"foo\" and \"foo/bar\")
+    attr_accessor :base_path
+
     # RepositoryVersion to be served
     attr_accessor :repository_version
 
-    attr_accessor :pulp_labels
-
-    # The latest RepositoryVersion for this Repository will be served.
-    attr_accessor :repository
-
     # Restrict pull access to explicitly authorized users. Defaults to unrestricted pull access.
     attr_accessor :private
 
@@ -41,12 +41,12 @@ module PulpContainerClient
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
-        :'base_path' => :'base_path',
+        :'repository' => :'repository',
+        :'pulp_labels' => :'pulp_labels',
         :'name' => :'name',
         :'content_guard' => :'content_guard',
+        :'base_path' => :'base_path',
         :'repository_version' => :'repository_version',
-        :'pulp_labels' => :'pulp_labels',
-        :'repository' => :'repository',
         :'private' => :'private',
         :'description' => :'description'
       }
@@ -55,12 +55,12 @@ module PulpContainerClient
     # Attribute type mapping.
     def self.openapi_types
       {
-        :'base_path' => :'String',
+        :'repository' => :'String',
+        :'pulp_labels' => :'Object',
         :'name' => :'String',
         :'content_guard' => :'String',
+        :'base_path' => :'String',
         :'repository_version' => :'String',
-        :'pulp_labels' => :'Object',
-        :'repository' => :'String',
         :'private' => :'Boolean',
         :'description' => :'String'
       }
@@ -69,8 +69,8 @@ module PulpContainerClient
     # List of attributes with nullable: true
     def self.openapi_nullable
       Set.new([
-        :'repository_version',
         :'repository',
+        :'repository_version',
         :'description'
       ])
     end
@@ -90,8 +90,12 @@ module PulpContainerClient
         h[k.to_sym] = v
       }
 
-      if attributes.key?(:'base_path')
-        self.base_path = attributes[:'base_path']
+      if attributes.key?(:'repository')
+        self.repository = attributes[:'repository']
+      end
+
+      if attributes.key?(:'pulp_labels')
+        self.pulp_labels = attributes[:'pulp_labels']
       end
 
       if attributes.key?(:'name')
@@ -102,16 +106,12 @@ module PulpContainerClient
         self.content_guard = attributes[:'content_guard']
       end
 
-      if attributes.key?(:'repository_version')
-        self.repository_version = attributes[:'repository_version']
-      end
-
-      if attributes.key?(:'pulp_labels')
-        self.pulp_labels = attributes[:'pulp_labels']
+      if attributes.key?(:'base_path')
+        self.base_path = attributes[:'base_path']
       end
 
-      if attributes.key?(:'repository')
-        self.repository = attributes[:'repository']
+      if attributes.key?(:'repository_version')
+        self.repository_version = attributes[:'repository_version']
       end
 
       if attributes.key?(:'private')
@@ -141,12 +141,12 @@ module PulpContainerClient
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
-          base_path == o.base_path &&
+          repository == o.repository &&
+          pulp_labels == o.pulp_labels &&
           name == o.name &&
           content_guard == o.content_guard &&
+          base_path == o.base_path &&
           repository_version == o.repository_version &&
-          pulp_labels == o.pulp_labels &&
-          repository == o.repository &&
           private == o.private &&
           description == o.description
     end
@@ -160,7 +160,7 @@ module PulpContainerClient
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [base_path, name, content_guard, repository_version, pulp_labels, repository, private, description].hash
+      [repository, pulp_labels, name, content_guard, base_path, repository_version, private, description].hash
     end
 
     # Builds the object from hash

data/lib/pulp_container_client/models/patchedcontainer_container_repository.rb

@@ -23,6 +23,9 @@ module PulpContainerClient
     # An optional description.
     attr_accessor :description
 
+    # Retain X versions of the repository. Default is null which retains all versions. This is provided as a tech preview in Pulp 3 and may change in the future.
+    attr_accessor :retained_versions
+
     attr_accessor :remote
 
     # Attribute mapping from ruby-style variable name to JSON key.
@@ -31,6 +34,7 @@ module PulpContainerClient
         :'pulp_labels' => :'pulp_labels',
         :'name' => :'name',
         :'description' => :'description',
+        :'retained_versions' => :'retained_versions',
         :'remote' => :'remote'
       }
     end
@@ -41,6 +45,7 @@ module PulpContainerClient
         :'pulp_labels' => :'Object',
         :'name' => :'String',
         :'description' => :'String',
+        :'retained_versions' => :'Integer',
         :'remote' => :'String'
       }
     end
@@ -49,6 +54,7 @@ module PulpContainerClient
     def self.openapi_nullable
       Set.new([
         :'description',
+        :'retained_versions',
         :'remote'
       ])
     end
@@ -80,6 +86,10 @@ module PulpContainerClient
         self.description = attributes[:'description']
       end
 
+      if attributes.key?(:'retained_versions')
+        self.retained_versions = attributes[:'retained_versions']
+      end
+
       if attributes.key?(:'remote')
         self.remote = attributes[:'remote']
       end
@@ -89,15 +99,30 @@ module PulpContainerClient
     # @return Array for valid properties with the reasons
     def list_invalid_properties
       invalid_properties = Array.new
+      if !@retained_versions.nil? && @retained_versions < 1
+        invalid_properties.push('invalid value for "retained_versions", must be greater than or equal to 1.')
+      end
+
       invalid_properties
     end
 
     # Check to see if the all the properties in the model are valid
     # @return true if the model is valid
     def valid?
+      return false if !@retained_versions.nil? && @retained_versions < 1
       true
     end
 
+    # Custom attribute writer method with validation
+    # @param [Object] retained_versions Value to be assigned
+    def retained_versions=(retained_versions)
+      if !retained_versions.nil? && retained_versions < 1
+        fail ArgumentError, 'invalid value for "retained_versions", must be greater than or equal to 1.'
+      end
+
+      @retained_versions = retained_versions
+    end
+
     # Checks equality by comparing each attribute.
     # @param [Object] Object to be compared
     def ==(o)
@@ -106,6 +131,7 @@ module PulpContainerClient
           pulp_labels == o.pulp_labels &&
           name == o.name &&
           description == o.description &&
+          retained_versions == o.retained_versions &&
           remote == o.remote
     end
 
@@ -118,7 +144,7 @@ module PulpContainerClient
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [pulp_labels, name, description, remote].hash
+      [pulp_labels, name, description, retained_versions, remote].hash
     end
 
     # Builds the object from hash

data/lib/pulp_container_client/models/repository_version_response.rb

@@ -22,6 +22,8 @@ module PulpContainerClient
 
     attr_accessor :number
 
+    attr_accessor :repository
+
     # A repository version whose content was used as the initial set of content for this repository version
     attr_accessor :base_version
 
@@ -34,6 +36,7 @@ module PulpContainerClient
         :'pulp_href' => :'pulp_href',
         :'pulp_created' => :'pulp_created',
         :'number' => :'number',
+        :'repository' => :'repository',
         :'base_version' => :'base_version',
         :'content_summary' => :'content_summary'
       }
@@ -45,6 +48,7 @@ module PulpContainerClient
         :'pulp_href' => :'String',
         :'pulp_created' => :'DateTime',
         :'number' => :'Integer',
+        :'repository' => :'String',
         :'base_version' => :'String',
         :'content_summary' => :'ContentSummaryResponse'
       }
@@ -83,6 +87,10 @@ module PulpContainerClient
         self.number = attributes[:'number']
       end
 
+      if attributes.key?(:'repository')
+        self.repository = attributes[:'repository']
+      end
+
       if attributes.key?(:'base_version')
         self.base_version = attributes[:'base_version']
       end
@@ -113,6 +121,7 @@ module PulpContainerClient
           pulp_href == o.pulp_href &&
           pulp_created == o.pulp_created &&
           number == o.number &&
+          repository == o.repository &&
           base_version == o.base_version &&
           content_summary == o.content_summary
     end
@@ -126,7 +135,7 @@ module PulpContainerClient
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [pulp_href, pulp_created, number, base_version, content_summary].hash
+      [pulp_href, pulp_created, number, repository, base_version, content_summary].hash
     end
 
     # Builds the object from hash

data/lib/pulp_container_client/version.rb

@@ -11,5 +11,5 @@ OpenAPI Generator version: 4.2.3
 =end
 
 module PulpContainerClient
-  VERSION = '2.5.2'
+  VERSION = '2.6.0'
 end

data/spec/api/content_blobs_api_spec.rb

@@ -39,7 +39,7 @@ describe 'ContentBlobsApi' do
   # @option opts [String] :digest Filter results where digest matches value
   # @option opts [Array<String>] :digest__in Filter results where digest is in a comma-separated list of values
   # @option opts [Integer] :limit Number of results to return per page.
-  # @option opts [String] :media_type 
+  # @option opts [Array<String>] :media_type 
   # @option opts [Integer] :offset The initial index from which to return the results.
   # @option opts [String] :ordering Which field to use when ordering the results.
   # @option opts [String] :repository_version Repository Version referenced by HREF