pulp_container_client 2.20.4 → 2.21.1

data/lib/pulp_container_client/models/patchedcontainer_container_distribution.rb

@@ -15,22 +15,22 @@ require 'date'
 module PulpContainerClient
   # A serializer for ContainerDistribution.
   class PatchedcontainerContainerDistribution
+    attr_accessor :pulp_labels
+
+    # An optional content-guard. If none is specified, a default one will be used.
+    attr_accessor :content_guard
+
     # Whether this distribution should be shown in the content app.
     attr_accessor :hidden
 
     # The latest RepositoryVersion for this Repository will be served.
     attr_accessor :repository
 
-    # 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
-
-    attr_accessor :pulp_labels
-
     # A unique name. Ex, `rawhide` and `stable`.
     attr_accessor :name
 
-    # 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
@@ -44,12 +44,12 @@ module PulpContainerClient
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
+        :'pulp_labels' => :'pulp_labels',
+        :'content_guard' => :'content_guard',
         :'hidden' => :'hidden',
         :'repository' => :'repository',
-        :'base_path' => :'base_path',
-        :'pulp_labels' => :'pulp_labels',
         :'name' => :'name',
-        :'content_guard' => :'content_guard',
+        :'base_path' => :'base_path',
         :'repository_version' => :'repository_version',
         :'private' => :'private',
         :'description' => :'description'
@@ -59,12 +59,12 @@ module PulpContainerClient
     # Attribute type mapping.
     def self.openapi_types
       {
+        :'pulp_labels' => :'Hash<String, String>',
+        :'content_guard' => :'String',
         :'hidden' => :'Boolean',
         :'repository' => :'String',
-        :'base_path' => :'String',
-        :'pulp_labels' => :'Hash<String, String>',
         :'name' => :'String',
-        :'content_guard' => :'String',
+        :'base_path' => :'String',
         :'repository_version' => :'String',
         :'private' => :'Boolean',
         :'description' => :'String'
@@ -95,6 +95,16 @@ module PulpContainerClient
         h[k.to_sym] = v
       }
 
+      if attributes.key?(:'pulp_labels')
+        if (value = attributes[:'pulp_labels']).is_a?(Hash)
+          self.pulp_labels = value
+        end
+      end
+
+      if attributes.key?(:'content_guard')
+        self.content_guard = attributes[:'content_guard']
+      end
+
       if attributes.key?(:'hidden')
         self.hidden = attributes[:'hidden']
       else
@@ -105,22 +115,12 @@ module PulpContainerClient
         self.repository = attributes[:'repository']
       end
 
-      if attributes.key?(:'base_path')
-        self.base_path = attributes[:'base_path']
-      end
-
-      if attributes.key?(:'pulp_labels')
-        if (value = attributes[:'pulp_labels']).is_a?(Hash)
-          self.pulp_labels = value
-        end
-      end
-
       if attributes.key?(:'name')
         self.name = attributes[:'name']
       end
 
-      if attributes.key?(:'content_guard')
-        self.content_guard = attributes[:'content_guard']
+      if attributes.key?(:'base_path')
+        self.base_path = attributes[:'base_path']
       end
 
       if attributes.key?(:'repository_version')
@@ -140,14 +140,14 @@ module PulpContainerClient
     # @return Array for valid properties with the reasons
     def list_invalid_properties
       invalid_properties = Array.new
-      if !@base_path.nil? && @base_path.to_s.length < 1
-        invalid_properties.push('invalid value for "base_path", the character length must be great 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
 
+      if !@base_path.nil? && @base_path.to_s.length < 1
+        invalid_properties.push('invalid value for "base_path", the character length must be great than or equal to 1.')
+      end
+
       if !@description.nil? && @description.to_s.length < 1
         invalid_properties.push('invalid value for "description", the character length must be great than or equal to 1.')
       end
@@ -158,22 +158,12 @@ module PulpContainerClient
     # 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 !@base_path.nil? && @base_path.to_s.length < 1
       return false if !@name.nil? && @name.to_s.length < 1
+      return false if !@base_path.nil? && @base_path.to_s.length < 1
       return false if !@description.nil? && @description.to_s.length < 1
       true
     end
 
-    # Custom attribute writer method with validation
-    # @param [Object] base_path Value to be assigned
-    def base_path=(base_path)
-      if !base_path.nil? && base_path.to_s.length < 1
-        fail ArgumentError, 'invalid value for "base_path", the character length must be great than or equal to 1.'
-      end
-
-      @base_path = base_path
-    end
-
     # Custom attribute writer method with validation
     # @param [Object] name Value to be assigned
     def name=(name)
@@ -184,6 +174,16 @@ module PulpContainerClient
       @name = name
     end
 
+    # Custom attribute writer method with validation
+    # @param [Object] base_path Value to be assigned
+    def base_path=(base_path)
+      if !base_path.nil? && base_path.to_s.length < 1
+        fail ArgumentError, 'invalid value for "base_path", the character length must be great than or equal to 1.'
+      end
+
+      @base_path = base_path
+    end
+
     # Custom attribute writer method with validation
     # @param [Object] description Value to be assigned
     def description=(description)
@@ -199,12 +199,12 @@ module PulpContainerClient
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
+          pulp_labels == o.pulp_labels &&
+          content_guard == o.content_guard &&
           hidden == o.hidden &&
           repository == o.repository &&
-          base_path == o.base_path &&
-          pulp_labels == o.pulp_labels &&
           name == o.name &&
-          content_guard == o.content_guard &&
+          base_path == o.base_path &&
           repository_version == o.repository_version &&
           private == o.private &&
           description == o.description
@@ -219,7 +219,7 @@ module PulpContainerClient
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [hidden, repository, base_path, pulp_labels, name, content_guard, repository_version, private, description].hash
+      [pulp_labels, content_guard, hidden, repository, name, base_path, repository_version, private, description].hash
     end
 
     # Builds the object from hash

data/lib/pulp_container_client/models/patchedcontainer_container_pull_through_distribution.rb

@@ -15,22 +15,22 @@ require 'date'
 module PulpContainerClient
   # A serializer for a specialized pull-through distribution referencing sub-distributions.
   class PatchedcontainerContainerPullThroughDistribution
+    attr_accessor :pulp_labels
+
+    # An optional content-guard. If none is specified, a default one will be used.
+    attr_accessor :content_guard
+
     # Whether this distribution should be shown in the content app.
     attr_accessor :hidden
 
     # The latest RepositoryVersion for this Repository will be served.
     attr_accessor :repository
 
-    # 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
-
-    attr_accessor :pulp_labels
-
     # A unique name. Ex, `rawhide` and `stable`.
     attr_accessor :name
 
-    # 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
 
     # Remote that can be used to fetch content when using pull-through caching.
     attr_accessor :remote
@@ -47,12 +47,12 @@ module PulpContainerClient
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
+        :'pulp_labels' => :'pulp_labels',
+        :'content_guard' => :'content_guard',
         :'hidden' => :'hidden',
         :'repository' => :'repository',
-        :'base_path' => :'base_path',
-        :'pulp_labels' => :'pulp_labels',
         :'name' => :'name',
-        :'content_guard' => :'content_guard',
+        :'base_path' => :'base_path',
         :'remote' => :'remote',
         :'distributions' => :'distributions',
         :'private' => :'private',
@@ -63,12 +63,12 @@ module PulpContainerClient
     # Attribute type mapping.
     def self.openapi_types
       {
+        :'pulp_labels' => :'Hash<String, String>',
+        :'content_guard' => :'String',
         :'hidden' => :'Boolean',
         :'repository' => :'String',
-        :'base_path' => :'String',
-        :'pulp_labels' => :'Hash<String, String>',
         :'name' => :'String',
-        :'content_guard' => :'String',
+        :'base_path' => :'String',
         :'remote' => :'String',
         :'distributions' => :'Array<String>',
         :'private' => :'Boolean',
@@ -99,6 +99,16 @@ module PulpContainerClient
         h[k.to_sym] = v
       }
 
+      if attributes.key?(:'pulp_labels')
+        if (value = attributes[:'pulp_labels']).is_a?(Hash)
+          self.pulp_labels = value
+        end
+      end
+
+      if attributes.key?(:'content_guard')
+        self.content_guard = attributes[:'content_guard']
+      end
+
       if attributes.key?(:'hidden')
         self.hidden = attributes[:'hidden']
       else
@@ -109,22 +119,12 @@ module PulpContainerClient
         self.repository = attributes[:'repository']
       end
 
-      if attributes.key?(:'base_path')
-        self.base_path = attributes[:'base_path']
-      end
-
-      if attributes.key?(:'pulp_labels')
-        if (value = attributes[:'pulp_labels']).is_a?(Hash)
-          self.pulp_labels = value
-        end
-      end
-
       if attributes.key?(:'name')
         self.name = attributes[:'name']
       end
 
-      if attributes.key?(:'content_guard')
-        self.content_guard = attributes[:'content_guard']
+      if attributes.key?(:'base_path')
+        self.base_path = attributes[:'base_path']
       end
 
       if attributes.key?(:'remote')
@@ -150,14 +150,14 @@ module PulpContainerClient
     # @return Array for valid properties with the reasons
     def list_invalid_properties
       invalid_properties = Array.new
-      if !@base_path.nil? && @base_path.to_s.length < 1
-        invalid_properties.push('invalid value for "base_path", the character length must be great 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
 
+      if !@base_path.nil? && @base_path.to_s.length < 1
+        invalid_properties.push('invalid value for "base_path", the character length must be great than or equal to 1.')
+      end
+
       if !@description.nil? && @description.to_s.length < 1
         invalid_properties.push('invalid value for "description", the character length must be great than or equal to 1.')
       end
@@ -168,22 +168,12 @@ module PulpContainerClient
     # 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 !@base_path.nil? && @base_path.to_s.length < 1
       return false if !@name.nil? && @name.to_s.length < 1
+      return false if !@base_path.nil? && @base_path.to_s.length < 1
       return false if !@description.nil? && @description.to_s.length < 1
       true
     end
 
-    # Custom attribute writer method with validation
-    # @param [Object] base_path Value to be assigned
-    def base_path=(base_path)
-      if !base_path.nil? && base_path.to_s.length < 1
-        fail ArgumentError, 'invalid value for "base_path", the character length must be great than or equal to 1.'
-      end
-
-      @base_path = base_path
-    end
-
     # Custom attribute writer method with validation
     # @param [Object] name Value to be assigned
     def name=(name)
@@ -194,6 +184,16 @@ module PulpContainerClient
       @name = name
     end
 
+    # Custom attribute writer method with validation
+    # @param [Object] base_path Value to be assigned
+    def base_path=(base_path)
+      if !base_path.nil? && base_path.to_s.length < 1
+        fail ArgumentError, 'invalid value for "base_path", the character length must be great than or equal to 1.'
+      end
+
+      @base_path = base_path
+    end
+
     # Custom attribute writer method with validation
     # @param [Object] description Value to be assigned
     def description=(description)
@@ -209,12 +209,12 @@ module PulpContainerClient
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
+          pulp_labels == o.pulp_labels &&
+          content_guard == o.content_guard &&
           hidden == o.hidden &&
           repository == o.repository &&
-          base_path == o.base_path &&
-          pulp_labels == o.pulp_labels &&
           name == o.name &&
-          content_guard == o.content_guard &&
+          base_path == o.base_path &&
           remote == o.remote &&
           distributions == o.distributions &&
           private == o.private &&
@@ -230,7 +230,7 @@ module PulpContainerClient
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [hidden, repository, base_path, pulp_labels, name, content_guard, remote, distributions, private, description].hash
+      [pulp_labels, content_guard, hidden, repository, name, base_path, remote, distributions, private, description].hash
     end
 
     # Builds the object from hash

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

data/lib/pulp_container_client/models/{policy762_enum.rb → policy692_enum.rb}

@@ -13,7 +13,7 @@ OpenAPI Generator version: 4.3.1
 require 'date'
 
 module PulpContainerClient
-  class Policy762Enum
+  class Policy692Enum
     IMMEDIATE = "immediate".freeze
     ON_DEMAND = "on_demand".freeze
     STREAMED = "streamed".freeze
@@ -29,8 +29,8 @@ module PulpContainerClient
     # @param [String] The enum value in the form of the string
     # @return [String] The enum value
     def build_from_hash(value)
-      constantValues = Policy762Enum.constants.select { |c| Policy762Enum::const_get(c) == value }
-      raise "Invalid ENUM value #{value} for class #Policy762Enum" if constantValues.empty?
+      constantValues = Policy692Enum.constants.select { |c| Policy692Enum::const_get(c) == value }
+      raise "Invalid ENUM value #{value} for class #Policy692Enum" if constantValues.empty?
       value
     end
   end