pulp_container_client 2.20.6 → 2.21.0

data/lib/pulp_container_client/models/patchedcontainer_container_pull_through_remote.rb

@@ -76,6 +76,12 @@ module PulpContainerClient
     # Limits requests per second for each concurrent downloader
     attr_accessor :rate_limit
 
+    #              A list of remotes to include during pull-through caching.             Wildcards *, ? are recognized.             'includes' is evaluated before 'excludes'.             
+    attr_accessor :includes
+
+    #              A list of remotes to exclude during pull-through caching.             Wildcards *, ? are recognized.             'excludes' is evaluated after 'includes'.             
+    attr_accessor :excludes
+
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
@@ -99,7 +105,9 @@ module PulpContainerClient
         :'sock_connect_timeout' => :'sock_connect_timeout',
         :'sock_read_timeout' => :'sock_read_timeout',
         :'headers' => :'headers',
-        :'rate_limit' => :'rate_limit'
+        :'rate_limit' => :'rate_limit',
+        :'includes' => :'includes',
+        :'excludes' => :'excludes'
       }
     end
 
@@ -120,13 +128,15 @@ module PulpContainerClient
         :'pulp_labels' => :'Hash<String, String>',
         :'download_concurrency' => :'Integer',
         :'max_retries' => :'Integer',
-        :'policy' => :'Policy8e2Enum',
+        :'policy' => :'Policy7e0Enum',
         :'total_timeout' => :'Float',
         :'connect_timeout' => :'Float',
         :'sock_connect_timeout' => :'Float',
         :'sock_read_timeout' => :'Float',
         :'headers' => :'Array<Object>',
-        :'rate_limit' => :'Integer'
+        :'rate_limit' => :'Integer',
+        :'includes' => :'Array<String>',
+        :'excludes' => :'Array<String>'
       }
     end
 
@@ -147,7 +157,9 @@ module PulpContainerClient
         :'connect_timeout',
         :'sock_connect_timeout',
         :'sock_read_timeout',
-        :'rate_limit'
+        :'rate_limit',
+        :'includes',
+        :'excludes'
       ])
     end
 
@@ -253,6 +265,18 @@ module PulpContainerClient
       if attributes.key?(:'rate_limit')
         self.rate_limit = attributes[:'rate_limit']
       end
+
+      if attributes.key?(:'includes')
+        if (value = attributes[:'includes']).is_a?(Array)
+          self.includes = value
+        end
+      end
+
+      if attributes.key?(:'excludes')
+        if (value = attributes[:'excludes']).is_a?(Array)
+          self.excludes = value
+        end
+      end
     end
 
     # Show invalid properties with the reasons. Usually used together with valid?
@@ -303,20 +327,20 @@ module PulpContainerClient
         invalid_properties.push('invalid value for "download_concurrency", must be greater than or equal to 1.')
       end
 
-      if !@total_timeout.nil? && @total_timeout < 0.0
-        invalid_properties.push('invalid value for "total_timeout", must be greater than or equal to 0.0.')
+      if !@total_timeout.nil? && @total_timeout < 0
+        invalid_properties.push('invalid value for "total_timeout", must be greater than or equal to 0.')
       end
 
-      if !@connect_timeout.nil? && @connect_timeout < 0.0
-        invalid_properties.push('invalid value for "connect_timeout", must be greater than or equal to 0.0.')
+      if !@connect_timeout.nil? && @connect_timeout < 0
+        invalid_properties.push('invalid value for "connect_timeout", must be greater than or equal to 0.')
       end
 
-      if !@sock_connect_timeout.nil? && @sock_connect_timeout < 0.0
-        invalid_properties.push('invalid value for "sock_connect_timeout", must be greater than or equal to 0.0.')
+      if !@sock_connect_timeout.nil? && @sock_connect_timeout < 0
+        invalid_properties.push('invalid value for "sock_connect_timeout", must be greater than or equal to 0.')
       end
 
-      if !@sock_read_timeout.nil? && @sock_read_timeout < 0.0
-        invalid_properties.push('invalid value for "sock_read_timeout", must be greater than or equal to 0.0.')
+      if !@sock_read_timeout.nil? && @sock_read_timeout < 0
+        invalid_properties.push('invalid value for "sock_read_timeout", must be greater than or equal to 0.')
       end
 
       invalid_properties
@@ -336,10 +360,10 @@ module PulpContainerClient
       return false if !@username.nil? && @username.to_s.length < 1
       return false if !@password.nil? && @password.to_s.length < 1
       return false if !@download_concurrency.nil? && @download_concurrency < 1
-      return false if !@total_timeout.nil? && @total_timeout < 0.0
-      return false if !@connect_timeout.nil? && @connect_timeout < 0.0
-      return false if !@sock_connect_timeout.nil? && @sock_connect_timeout < 0.0
-      return false if !@sock_read_timeout.nil? && @sock_read_timeout < 0.0
+      return false if !@total_timeout.nil? && @total_timeout < 0
+      return false if !@connect_timeout.nil? && @connect_timeout < 0
+      return false if !@sock_connect_timeout.nil? && @sock_connect_timeout < 0
+      return false if !@sock_read_timeout.nil? && @sock_read_timeout < 0
       true
     end
 
@@ -456,8 +480,8 @@ module PulpContainerClient
     # Custom attribute writer method with validation
     # @param [Object] total_timeout Value to be assigned
     def total_timeout=(total_timeout)
-      if !total_timeout.nil? && total_timeout < 0.0
-        fail ArgumentError, 'invalid value for "total_timeout", must be greater than or equal to 0.0.'
+      if !total_timeout.nil? && total_timeout < 0
+        fail ArgumentError, 'invalid value for "total_timeout", must be greater than or equal to 0.'
       end
 
       @total_timeout = total_timeout
@@ -466,8 +490,8 @@ module PulpContainerClient
     # Custom attribute writer method with validation
     # @param [Object] connect_timeout Value to be assigned
     def connect_timeout=(connect_timeout)
-      if !connect_timeout.nil? && connect_timeout < 0.0
-        fail ArgumentError, 'invalid value for "connect_timeout", must be greater than or equal to 0.0.'
+      if !connect_timeout.nil? && connect_timeout < 0
+        fail ArgumentError, 'invalid value for "connect_timeout", must be greater than or equal to 0.'
       end
 
       @connect_timeout = connect_timeout
@@ -476,8 +500,8 @@ module PulpContainerClient
     # Custom attribute writer method with validation
     # @param [Object] sock_connect_timeout Value to be assigned
     def sock_connect_timeout=(sock_connect_timeout)
-      if !sock_connect_timeout.nil? && sock_connect_timeout < 0.0
-        fail ArgumentError, 'invalid value for "sock_connect_timeout", must be greater than or equal to 0.0.'
+      if !sock_connect_timeout.nil? && sock_connect_timeout < 0
+        fail ArgumentError, 'invalid value for "sock_connect_timeout", must be greater than or equal to 0.'
       end
 
       @sock_connect_timeout = sock_connect_timeout
@@ -486,8 +510,8 @@ module PulpContainerClient
     # Custom attribute writer method with validation
     # @param [Object] sock_read_timeout Value to be assigned
     def sock_read_timeout=(sock_read_timeout)
-      if !sock_read_timeout.nil? && sock_read_timeout < 0.0
-        fail ArgumentError, 'invalid value for "sock_read_timeout", must be greater than or equal to 0.0.'
+      if !sock_read_timeout.nil? && sock_read_timeout < 0
+        fail ArgumentError, 'invalid value for "sock_read_timeout", must be greater than or equal to 0.'
       end
 
       @sock_read_timeout = sock_read_timeout
@@ -518,7 +542,9 @@ module PulpContainerClient
           sock_connect_timeout == o.sock_connect_timeout &&
           sock_read_timeout == o.sock_read_timeout &&
           headers == o.headers &&
-          rate_limit == o.rate_limit
+          rate_limit == o.rate_limit &&
+          includes == o.includes &&
+          excludes == o.excludes
     end
 
     # @see the `==` method
@@ -530,7 +556,7 @@ module PulpContainerClient
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [name, url, ca_cert, client_cert, client_key, tls_validation, proxy_url, proxy_username, proxy_password, username, password, pulp_labels, download_concurrency, max_retries, policy, total_timeout, connect_timeout, sock_connect_timeout, sock_read_timeout, headers, rate_limit].hash
+      [name, url, ca_cert, client_cert, client_key, tls_validation, proxy_url, proxy_username, proxy_password, username, password, pulp_labels, download_concurrency, max_retries, policy, total_timeout, connect_timeout, sock_connect_timeout, sock_read_timeout, headers, rate_limit, includes, excludes].hash
     end
 
     # Builds the object from hash

data/lib/pulp_container_client/models/patchedcontainer_container_push_repository.rb

@@ -15,48 +15,48 @@ require 'date'
 module PulpContainerClient
   # Serializer for Container Push Repositories.
   class PatchedcontainerContainerPushRepository
+    # Retain X versions of the repository. Default is null which retains all versions.
+    attr_accessor :retain_repo_versions
+
     # A unique name for this repository.
     attr_accessor :name
 
+    attr_accessor :pulp_labels
+
     # An optional description.
     attr_accessor :description
 
     # A reference to an associated signing service.
     attr_accessor :manifest_signing_service
 
-    # Retain X versions of the repository. Default is null which retains all versions.
-    attr_accessor :retain_repo_versions
-
-    attr_accessor :pulp_labels
-
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
+        :'retain_repo_versions' => :'retain_repo_versions',
         :'name' => :'name',
+        :'pulp_labels' => :'pulp_labels',
         :'description' => :'description',
-        :'manifest_signing_service' => :'manifest_signing_service',
-        :'retain_repo_versions' => :'retain_repo_versions',
-        :'pulp_labels' => :'pulp_labels'
+        :'manifest_signing_service' => :'manifest_signing_service'
       }
     end
 
     # Attribute type mapping.
     def self.openapi_types
       {
+        :'retain_repo_versions' => :'Integer',
         :'name' => :'String',
+        :'pulp_labels' => :'Hash<String, String>',
         :'description' => :'String',
-        :'manifest_signing_service' => :'String',
-        :'retain_repo_versions' => :'Integer',
-        :'pulp_labels' => :'Hash<String, String>'
+        :'manifest_signing_service' => :'String'
       }
     end
 
     # List of attributes with nullable: true
     def self.openapi_nullable
       Set.new([
-        :'description',
-        :'manifest_signing_service',
         :'retain_repo_versions',
+        :'description',
+        :'manifest_signing_service'
       ])
     end
 
@@ -75,10 +75,20 @@ module PulpContainerClient
         h[k.to_sym] = v
       }
 
+      if attributes.key?(:'retain_repo_versions')
+        self.retain_repo_versions = attributes[:'retain_repo_versions']
+      end
+
       if attributes.key?(:'name')
         self.name = attributes[:'name']
       end
 
+      if attributes.key?(:'pulp_labels')
+        if (value = attributes[:'pulp_labels']).is_a?(Hash)
+          self.pulp_labels = value
+        end
+      end
+
       if attributes.key?(:'description')
         self.description = attributes[:'description']
       end
@@ -86,22 +96,16 @@ module PulpContainerClient
       if attributes.key?(:'manifest_signing_service')
         self.manifest_signing_service = attributes[:'manifest_signing_service']
       end
-
-      if attributes.key?(:'retain_repo_versions')
-        self.retain_repo_versions = attributes[:'retain_repo_versions']
-      end
-
-      if attributes.key?(:'pulp_labels')
-        if (value = attributes[:'pulp_labels']).is_a?(Hash)
-          self.pulp_labels = value
-        end
-      end
     end
 
     # Show invalid properties with the reasons. Usually used together with valid?
     # @return Array for valid properties with the reasons
     def list_invalid_properties
       invalid_properties = Array.new
+      if !@retain_repo_versions.nil? && @retain_repo_versions < 1
+        invalid_properties.push('invalid value for "retain_repo_versions", must be greater than or equal to 1.')
+      end
+
       if !@name.nil? && @name.to_s.length < 1
         invalid_properties.push('invalid value for "name", the character length must be great than or equal to 1.')
       end
@@ -110,22 +114,28 @@ module PulpContainerClient
         invalid_properties.push('invalid value for "description", the character length must be great than or equal to 1.')
       end
 
-      if !@retain_repo_versions.nil? && @retain_repo_versions < 1
-        invalid_properties.push('invalid value for "retain_repo_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 !@retain_repo_versions.nil? && @retain_repo_versions < 1
       return false if !@name.nil? && @name.to_s.length < 1
       return false if !@description.nil? && @description.to_s.length < 1
-      return false if !@retain_repo_versions.nil? && @retain_repo_versions < 1
       true
     end
 
+    # Custom attribute writer method with validation
+    # @param [Object] retain_repo_versions Value to be assigned
+    def retain_repo_versions=(retain_repo_versions)
+      if !retain_repo_versions.nil? && retain_repo_versions < 1
+        fail ArgumentError, 'invalid value for "retain_repo_versions", must be greater than or equal to 1.'
+      end
+
+      @retain_repo_versions = retain_repo_versions
+    end
+
     # Custom attribute writer method with validation
     # @param [Object] name Value to be assigned
     def name=(name)
@@ -146,26 +156,16 @@ module PulpContainerClient
       @description = description
     end
 
-    # Custom attribute writer method with validation
-    # @param [Object] retain_repo_versions Value to be assigned
-    def retain_repo_versions=(retain_repo_versions)
-      if !retain_repo_versions.nil? && retain_repo_versions < 1
-        fail ArgumentError, 'invalid value for "retain_repo_versions", must be greater than or equal to 1.'
-      end
-
-      @retain_repo_versions = retain_repo_versions
-    end
-
     # Checks equality by comparing each attribute.
     # @param [Object] Object to be compared
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
+          retain_repo_versions == o.retain_repo_versions &&
           name == o.name &&
+          pulp_labels == o.pulp_labels &&
           description == o.description &&
-          manifest_signing_service == o.manifest_signing_service &&
-          retain_repo_versions == o.retain_repo_versions &&
-          pulp_labels == o.pulp_labels
+          manifest_signing_service == o.manifest_signing_service
     end
 
     # @see the `==` method
@@ -177,7 +177,7 @@ module PulpContainerClient
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [name, description, manifest_signing_service, retain_repo_versions, pulp_labels].hash
+      [retain_repo_versions, name, pulp_labels, description, manifest_signing_service].hash
     end
 
     # Builds the object from hash

data/lib/pulp_container_client/models/patchedcontainer_container_remote.rb

@@ -137,7 +137,7 @@ module PulpContainerClient
         :'pulp_labels' => :'Hash<String, String>',
         :'download_concurrency' => :'Integer',
         :'max_retries' => :'Integer',
-        :'policy' => :'Policy762Enum',
+        :'policy' => :'Policy692Enum',
         :'total_timeout' => :'Float',
         :'connect_timeout' => :'Float',
         :'sock_connect_timeout' => :'Float',
@@ -346,20 +346,20 @@ module PulpContainerClient
         invalid_properties.push('invalid value for "download_concurrency", must be greater than or equal to 1.')
       end
 
-      if !@total_timeout.nil? && @total_timeout < 0.0
-        invalid_properties.push('invalid value for "total_timeout", must be greater than or equal to 0.0.')
+      if !@total_timeout.nil? && @total_timeout < 0
+        invalid_properties.push('invalid value for "total_timeout", must be greater than or equal to 0.')
       end
 
-      if !@connect_timeout.nil? && @connect_timeout < 0.0
-        invalid_properties.push('invalid value for "connect_timeout", must be greater than or equal to 0.0.')
+      if !@connect_timeout.nil? && @connect_timeout < 0
+        invalid_properties.push('invalid value for "connect_timeout", must be greater than or equal to 0.')
       end
 
-      if !@sock_connect_timeout.nil? && @sock_connect_timeout < 0.0
-        invalid_properties.push('invalid value for "sock_connect_timeout", must be greater than or equal to 0.0.')
+      if !@sock_connect_timeout.nil? && @sock_connect_timeout < 0
+        invalid_properties.push('invalid value for "sock_connect_timeout", must be greater than or equal to 0.')
       end
 
-      if !@sock_read_timeout.nil? && @sock_read_timeout < 0.0
-        invalid_properties.push('invalid value for "sock_read_timeout", must be greater than or equal to 0.0.')
+      if !@sock_read_timeout.nil? && @sock_read_timeout < 0
+        invalid_properties.push('invalid value for "sock_read_timeout", must be greater than or equal to 0.')
       end
 
       if !@upstream_name.nil? && @upstream_name.to_s.length < 1
@@ -387,10 +387,10 @@ module PulpContainerClient
       return false if !@username.nil? && @username.to_s.length < 1
       return false if !@password.nil? && @password.to_s.length < 1
       return false if !@download_concurrency.nil? && @download_concurrency < 1
-      return false if !@total_timeout.nil? && @total_timeout < 0.0
-      return false if !@connect_timeout.nil? && @connect_timeout < 0.0
-      return false if !@sock_connect_timeout.nil? && @sock_connect_timeout < 0.0
-      return false if !@sock_read_timeout.nil? && @sock_read_timeout < 0.0
+      return false if !@total_timeout.nil? && @total_timeout < 0
+      return false if !@connect_timeout.nil? && @connect_timeout < 0
+      return false if !@sock_connect_timeout.nil? && @sock_connect_timeout < 0
+      return false if !@sock_read_timeout.nil? && @sock_read_timeout < 0
       return false if !@upstream_name.nil? && @upstream_name.to_s.length < 1
       return false if !@sigstore.nil? && @sigstore.to_s.length < 1
       true
@@ -509,8 +509,8 @@ module PulpContainerClient
     # Custom attribute writer method with validation
     # @param [Object] total_timeout Value to be assigned
     def total_timeout=(total_timeout)
-      if !total_timeout.nil? && total_timeout < 0.0
-        fail ArgumentError, 'invalid value for "total_timeout", must be greater than or equal to 0.0.'
+      if !total_timeout.nil? && total_timeout < 0
+        fail ArgumentError, 'invalid value for "total_timeout", must be greater than or equal to 0.'
       end
 
       @total_timeout = total_timeout
@@ -519,8 +519,8 @@ module PulpContainerClient
     # Custom attribute writer method with validation
     # @param [Object] connect_timeout Value to be assigned
     def connect_timeout=(connect_timeout)
-      if !connect_timeout.nil? && connect_timeout < 0.0
-        fail ArgumentError, 'invalid value for "connect_timeout", must be greater than or equal to 0.0.'
+      if !connect_timeout.nil? && connect_timeout < 0
+        fail ArgumentError, 'invalid value for "connect_timeout", must be greater than or equal to 0.'
       end
 
       @connect_timeout = connect_timeout
@@ -529,8 +529,8 @@ module PulpContainerClient
     # Custom attribute writer method with validation
     # @param [Object] sock_connect_timeout Value to be assigned
     def sock_connect_timeout=(sock_connect_timeout)
-      if !sock_connect_timeout.nil? && sock_connect_timeout < 0.0
-        fail ArgumentError, 'invalid value for "sock_connect_timeout", must be greater than or equal to 0.0.'
+      if !sock_connect_timeout.nil? && sock_connect_timeout < 0
+        fail ArgumentError, 'invalid value for "sock_connect_timeout", must be greater than or equal to 0.'
       end
 
       @sock_connect_timeout = sock_connect_timeout
@@ -539,8 +539,8 @@ module PulpContainerClient
     # Custom attribute writer method with validation
     # @param [Object] sock_read_timeout Value to be assigned
     def sock_read_timeout=(sock_read_timeout)
-      if !sock_read_timeout.nil? && sock_read_timeout < 0.0
-        fail ArgumentError, 'invalid value for "sock_read_timeout", must be greater than or equal to 0.0.'
+      if !sock_read_timeout.nil? && sock_read_timeout < 0
+        fail ArgumentError, 'invalid value for "sock_read_timeout", must be greater than or equal to 0.'
       end
 
       @sock_read_timeout = sock_read_timeout