pulp_container_client 2.27.12 → 2.28.0

data/lib/pulp_container_client/models/container_container_push_repository_response.rb

@@ -16,53 +16,53 @@ require 'time'
 module PulpContainerClient
   # Serializer for Container Push Repositories.
   class ContainerContainerPushRepositoryResponse
-    attr_accessor :pulp_href
-
-    # Timestamp of creation.
-    attr_accessor :pulp_created
-
-    attr_accessor :versions_href
+    # A reference to an associated signing service.
+    attr_accessor :manifest_signing_service
 
     # The Pulp Resource Name (PRN).
     attr_accessor :prn
 
-    # An optional description.
-    attr_accessor :description
-
-    # A reference to an associated signing service.
-    attr_accessor :manifest_signing_service
+    # Timestamp of the last time this resource was updated. Note: for immutable resources - like content, repository versions, and publication - pulp_created and pulp_last_updated dates will be the same.
+    attr_accessor :pulp_last_updated
 
     # Retain X versions of the repository. Default is null which retains all versions.
     attr_accessor :retain_repo_versions
 
+    attr_accessor :pulp_labels
+
     attr_accessor :latest_version_href
 
+    attr_accessor :pulp_href
+
     # A unique name for this repository.
     attr_accessor :name
 
-    attr_accessor :pulp_labels
+    # An optional description.
+    attr_accessor :description
+
+    # Timestamp of creation.
+    attr_accessor :pulp_created
+
+    attr_accessor :versions_href
 
     # Retain X checkpoint publications for the repository. Default is null which retains all checkpoints.
     attr_accessor :retain_checkpoints
 
-    # Timestamp of the last time this resource was updated. Note: for immutable resources - like content, repository versions, and publication - pulp_created and pulp_last_updated dates will be the same.
-    attr_accessor :pulp_last_updated
-
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
-        :'pulp_href' => :'pulp_href',
-        :'pulp_created' => :'pulp_created',
-        :'versions_href' => :'versions_href',
-        :'prn' => :'prn',
-        :'description' => :'description',
         :'manifest_signing_service' => :'manifest_signing_service',
+        :'prn' => :'prn',
+        :'pulp_last_updated' => :'pulp_last_updated',
         :'retain_repo_versions' => :'retain_repo_versions',
+        :'pulp_labels' => :'pulp_labels',
         :'latest_version_href' => :'latest_version_href',
+        :'pulp_href' => :'pulp_href',
         :'name' => :'name',
-        :'pulp_labels' => :'pulp_labels',
-        :'retain_checkpoints' => :'retain_checkpoints',
-        :'pulp_last_updated' => :'pulp_last_updated'
+        :'description' => :'description',
+        :'pulp_created' => :'pulp_created',
+        :'versions_href' => :'versions_href',
+        :'retain_checkpoints' => :'retain_checkpoints'
       }
     end
 
@@ -74,28 +74,28 @@ module PulpContainerClient
     # Attribute type mapping.
     def self.openapi_types
       {
-        :'pulp_href' => :'String',
-        :'pulp_created' => :'Time',
-        :'versions_href' => :'String',
-        :'prn' => :'String',
-        :'description' => :'String',
         :'manifest_signing_service' => :'String',
+        :'prn' => :'String',
+        :'pulp_last_updated' => :'Time',
         :'retain_repo_versions' => :'Integer',
+        :'pulp_labels' => :'Hash<String, String>',
         :'latest_version_href' => :'String',
+        :'pulp_href' => :'String',
         :'name' => :'String',
-        :'pulp_labels' => :'Hash<String, String>',
-        :'retain_checkpoints' => :'Integer',
-        :'pulp_last_updated' => :'Time'
+        :'description' => :'String',
+        :'pulp_created' => :'Time',
+        :'versions_href' => :'String',
+        :'retain_checkpoints' => :'Integer'
       }
     end
 
     # List of attributes with nullable: true
     def self.openapi_nullable
       Set.new([
-        :'description',
         :'manifest_signing_service',
         :'retain_repo_versions',
-        :'retain_checkpoints',
+        :'description',
+        :'retain_checkpoints'
       ])
     end
 
@@ -114,56 +114,56 @@ module PulpContainerClient
         h[k.to_sym] = v
       }
 
-      if attributes.key?(:'pulp_href')
-        self.pulp_href = attributes[:'pulp_href']
-      end
-
-      if attributes.key?(:'pulp_created')
-        self.pulp_created = attributes[:'pulp_created']
-      end
-
-      if attributes.key?(:'versions_href')
-        self.versions_href = attributes[:'versions_href']
+      if attributes.key?(:'manifest_signing_service')
+        self.manifest_signing_service = attributes[:'manifest_signing_service']
       end
 
       if attributes.key?(:'prn')
         self.prn = attributes[:'prn']
       end
 
-      if attributes.key?(:'description')
-        self.description = attributes[:'description']
-      end
-
-      if attributes.key?(:'manifest_signing_service')
-        self.manifest_signing_service = attributes[:'manifest_signing_service']
+      if attributes.key?(:'pulp_last_updated')
+        self.pulp_last_updated = attributes[:'pulp_last_updated']
       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
+
       if attributes.key?(:'latest_version_href')
         self.latest_version_href = attributes[:'latest_version_href']
       end
 
+      if attributes.key?(:'pulp_href')
+        self.pulp_href = attributes[:'pulp_href']
+      end
+
       if attributes.key?(:'name')
         self.name = attributes[:'name']
       else
         self.name = nil
       end
 
-      if attributes.key?(:'pulp_labels')
-        if (value = attributes[:'pulp_labels']).is_a?(Hash)
-          self.pulp_labels = value
-        end
+      if attributes.key?(:'description')
+        self.description = attributes[:'description']
       end
 
-      if attributes.key?(:'retain_checkpoints')
-        self.retain_checkpoints = attributes[:'retain_checkpoints']
+      if attributes.key?(:'pulp_created')
+        self.pulp_created = attributes[:'pulp_created']
       end
 
-      if attributes.key?(:'pulp_last_updated')
-        self.pulp_last_updated = attributes[:'pulp_last_updated']
+      if attributes.key?(:'versions_href')
+        self.versions_href = attributes[:'versions_href']
+      end
+
+      if attributes.key?(:'retain_checkpoints')
+        self.retain_checkpoints = attributes[:'retain_checkpoints']
       end
     end
 
@@ -222,18 +222,18 @@ module PulpContainerClient
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
-          pulp_href == o.pulp_href &&
-          pulp_created == o.pulp_created &&
-          versions_href == o.versions_href &&
-          prn == o.prn &&
-          description == o.description &&
           manifest_signing_service == o.manifest_signing_service &&
+          prn == o.prn &&
+          pulp_last_updated == o.pulp_last_updated &&
           retain_repo_versions == o.retain_repo_versions &&
+          pulp_labels == o.pulp_labels &&
           latest_version_href == o.latest_version_href &&
+          pulp_href == o.pulp_href &&
           name == o.name &&
-          pulp_labels == o.pulp_labels &&
-          retain_checkpoints == o.retain_checkpoints &&
-          pulp_last_updated == o.pulp_last_updated
+          description == o.description &&
+          pulp_created == o.pulp_created &&
+          versions_href == o.versions_href &&
+          retain_checkpoints == o.retain_checkpoints
     end
 
     # @see the `==` method
@@ -245,7 +245,7 @@ module PulpContainerClient
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [pulp_href, pulp_created, versions_href, prn, description, manifest_signing_service, retain_repo_versions, latest_version_href, name, pulp_labels, retain_checkpoints, pulp_last_updated].hash
+      [manifest_signing_service, prn, pulp_last_updated, retain_repo_versions, pulp_labels, latest_version_href, pulp_href, name, description, pulp_created, versions_href, retain_checkpoints].hash
     end
 
     # Builds the object from hash

data/lib/pulp_container_client/models/container_container_remote.rb

@@ -81,10 +81,16 @@ module PulpContainerClient
     # Name of the upstream repository
     attr_accessor :upstream_name
 
-    #              A list of tags to include during sync.             Wildcards *, ? are recognized.             'include_tags' is evaluated before 'exclude_tags'.             
+    # A list of tags (wildcards *, ? are recognized) and/or digests (format: 'sha256:<hex>') to include during sync. 'includes' is evaluated before 'excludes'.
+    attr_accessor :includes
+
+    # A list of tag patterns to exclude during sync. Wildcards *, ? are recognized. 'excludes' is evaluated after 'includes'.
+    attr_accessor :excludes
+
+    # Deprecated. Use 'includes' instead.
     attr_accessor :include_tags
 
-    #              A list of tags to exclude during sync.             Wildcards *, ? are recognized.             'exclude_tags' is evaluated after 'include_tags'.             
+    # Deprecated. Use 'excludes' instead.
     attr_accessor :exclude_tags
 
     # A URL to a sigstore to download image signatures from
@@ -137,6 +143,8 @@ module PulpContainerClient
         :'download_concurrency' => :'download_concurrency',
         :'rate_limit' => :'rate_limit',
         :'upstream_name' => :'upstream_name',
+        :'includes' => :'includes',
+        :'excludes' => :'excludes',
         :'include_tags' => :'include_tags',
         :'exclude_tags' => :'exclude_tags',
         :'sigstore' => :'sigstore'
@@ -173,6 +181,8 @@ module PulpContainerClient
         :'download_concurrency' => :'Integer',
         :'rate_limit' => :'Integer',
         :'upstream_name' => :'String',
+        :'includes' => :'Array<String>',
+        :'excludes' => :'Array<String>',
         :'include_tags' => :'Array<String>',
         :'exclude_tags' => :'Array<String>',
         :'sigstore' => :'String'
@@ -197,6 +207,8 @@ module PulpContainerClient
         :'sock_read_timeout',
         :'download_concurrency',
         :'rate_limit',
+        :'includes',
+        :'excludes',
         :'include_tags',
         :'exclude_tags',
       ])
@@ -315,6 +327,18 @@ module PulpContainerClient
         self.upstream_name = nil
       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
+
       if attributes.key?(:'include_tags')
         if (value = attributes[:'include_tags']).is_a?(Array)
           self.include_tags = value
@@ -660,6 +684,8 @@ module PulpContainerClient
           download_concurrency == o.download_concurrency &&
           rate_limit == o.rate_limit &&
           upstream_name == o.upstream_name &&
+          includes == o.includes &&
+          excludes == o.excludes &&
           include_tags == o.include_tags &&
           exclude_tags == o.exclude_tags &&
           sigstore == o.sigstore
@@ -674,7 +700,7 @@ module PulpContainerClient
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [name, url, pulp_labels, policy, ca_cert, client_cert, client_key, tls_validation, proxy_url, proxy_username, proxy_password, username, password, max_retries, total_timeout, connect_timeout, sock_connect_timeout, sock_read_timeout, headers, download_concurrency, rate_limit, upstream_name, include_tags, exclude_tags, sigstore].hash
+      [name, url, pulp_labels, policy, ca_cert, client_cert, client_key, tls_validation, proxy_url, proxy_username, proxy_password, username, password, max_retries, total_timeout, connect_timeout, sock_connect_timeout, sock_read_timeout, headers, download_concurrency, rate_limit, upstream_name, includes, excludes, include_tags, exclude_tags, sigstore].hash
     end
 
     # Builds the object from hash

data/lib/pulp_container_client/models/container_container_remote_response.rb

@@ -80,11 +80,11 @@ module PulpContainerClient
     # Name of the upstream repository
     attr_accessor :upstream_name
 
-    #              A list of tags to include during sync.             Wildcards *, ? are recognized.             'include_tags' is evaluated before 'exclude_tags'.             
-    attr_accessor :include_tags
+    # A list of tags (wildcards *, ? are recognized) and/or digests (format: 'sha256:<hex>') to include during sync. 'includes' is evaluated before 'excludes'.
+    attr_accessor :includes
 
-    #              A list of tags to exclude during sync.             Wildcards *, ? are recognized.             'exclude_tags' is evaluated after 'include_tags'.             
-    attr_accessor :exclude_tags
+    # A list of tag patterns to exclude during sync. Wildcards *, ? are recognized. 'excludes' is evaluated after 'includes'.
+    attr_accessor :excludes
 
     # A URL to a sigstore to download image signatures from
     attr_accessor :sigstore
@@ -136,8 +136,8 @@ module PulpContainerClient
         :'download_concurrency' => :'download_concurrency',
         :'rate_limit' => :'rate_limit',
         :'upstream_name' => :'upstream_name',
-        :'include_tags' => :'include_tags',
-        :'exclude_tags' => :'exclude_tags',
+        :'includes' => :'includes',
+        :'excludes' => :'excludes',
         :'sigstore' => :'sigstore'
       }
     end
@@ -172,8 +172,8 @@ module PulpContainerClient
         :'download_concurrency' => :'Integer',
         :'rate_limit' => :'Integer',
         :'upstream_name' => :'String',
-        :'include_tags' => :'Array<String>',
-        :'exclude_tags' => :'Array<String>',
+        :'includes' => :'Array<String>',
+        :'excludes' => :'Array<String>',
         :'sigstore' => :'String'
       }
     end
@@ -191,8 +191,8 @@ module PulpContainerClient
         :'sock_read_timeout',
         :'download_concurrency',
         :'rate_limit',
-        :'include_tags',
-        :'exclude_tags',
+        :'includes',
+        :'excludes',
       ])
     end
 
@@ -311,15 +311,15 @@ module PulpContainerClient
         self.upstream_name = nil
       end
 
-      if attributes.key?(:'include_tags')
-        if (value = attributes[:'include_tags']).is_a?(Array)
-          self.include_tags = value
+      if attributes.key?(:'includes')
+        if (value = attributes[:'includes']).is_a?(Array)
+          self.includes = value
         end
       end
 
-      if attributes.key?(:'exclude_tags')
-        if (value = attributes[:'exclude_tags']).is_a?(Array)
-          self.exclude_tags = value
+      if attributes.key?(:'excludes')
+        if (value = attributes[:'excludes']).is_a?(Array)
+          self.excludes = value
         end
       end
 
@@ -460,8 +460,8 @@ module PulpContainerClient
           download_concurrency == o.download_concurrency &&
           rate_limit == o.rate_limit &&
           upstream_name == o.upstream_name &&
-          include_tags == o.include_tags &&
-          exclude_tags == o.exclude_tags &&
+          includes == o.includes &&
+          excludes == o.excludes &&
           sigstore == o.sigstore
     end
 
@@ -474,7 +474,7 @@ module PulpContainerClient
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [pulp_href, prn, pulp_created, pulp_last_updated, name, url, pulp_labels, policy, hidden_fields, ca_cert, client_cert, tls_validation, proxy_url, max_retries, total_timeout, connect_timeout, sock_connect_timeout, sock_read_timeout, headers, download_concurrency, rate_limit, upstream_name, include_tags, exclude_tags, sigstore].hash
+      [pulp_href, prn, pulp_created, pulp_last_updated, name, url, pulp_labels, policy, hidden_fields, ca_cert, client_cert, tls_validation, proxy_url, max_retries, total_timeout, connect_timeout, sock_connect_timeout, sock_read_timeout, headers, download_concurrency, rate_limit, upstream_name, includes, excludes, sigstore].hash
     end
 
     # Builds the object from hash

data/lib/pulp_container_client/models/container_manifest_signature_response.rb

@@ -44,6 +44,9 @@ module PulpContainerClient
     # Signing key ID
     attr_accessor :key_id
 
+    # Signing key fingerprint
+    attr_accessor :fingerprint
+
     # Timestamp of a signature
     attr_accessor :timestamp
 
@@ -66,6 +69,7 @@ module PulpContainerClient
         :'digest' => :'digest',
         :'type' => :'type',
         :'key_id' => :'key_id',
+        :'fingerprint' => :'fingerprint',
         :'timestamp' => :'timestamp',
         :'creator' => :'creator',
         :'signed_manifest' => :'signed_manifest'
@@ -90,6 +94,7 @@ module PulpContainerClient
         :'digest' => :'String',
         :'type' => :'String',
         :'key_id' => :'String',
+        :'fingerprint' => :'String',
         :'timestamp' => :'Integer',
         :'creator' => :'String',
         :'signed_manifest' => :'String'
@@ -99,6 +104,7 @@ module PulpContainerClient
     # List of attributes with nullable: true
     def self.openapi_nullable
       Set.new([
+        :'fingerprint',
       ])
     end
 
@@ -167,6 +173,12 @@ module PulpContainerClient
         self.key_id = nil
       end
 
+      if attributes.key?(:'fingerprint')
+        self.fingerprint = attributes[:'fingerprint']
+      else
+        self.fingerprint = nil
+      end
+
       if attributes.key?(:'timestamp')
         self.timestamp = attributes[:'timestamp']
       else
@@ -251,6 +263,7 @@ module PulpContainerClient
           digest == o.digest &&
           type == o.type &&
           key_id == o.key_id &&
+          fingerprint == o.fingerprint &&
           timestamp == o.timestamp &&
           creator == o.creator &&
           signed_manifest == o.signed_manifest
@@ -265,7 +278,7 @@ module PulpContainerClient
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [pulp_href, prn, pulp_created, pulp_last_updated, pulp_labels, vuln_report, name, digest, type, key_id, timestamp, creator, signed_manifest].hash
+      [pulp_href, prn, pulp_created, pulp_last_updated, pulp_labels, vuln_report, name, digest, type, key_id, fingerprint, timestamp, creator, signed_manifest].hash
     end
 
     # Builds the object from hash

data/lib/pulp_container_client/models/patchedcontainer_container_distribution.rb

@@ -16,26 +16,26 @@ require 'time'
 module PulpContainerClient
   # A serializer for ContainerDistribution.
   class PatchedcontainerContainerDistribution
-    # 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
 
-    # A unique name. Ex, `rawhide` and `stable`.
-    attr_accessor :name
+    # 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
+
     # 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
-
     # RepositoryVersion to be served
     attr_accessor :repository_version
 
+    # An optional content-guard. If none is specified, a default one will be used.
+    attr_accessor :content_guard
+
     # Restrict pull access to explicitly authorized users. Defaults to unrestricted pull access.
     attr_accessor :private
 
@@ -45,13 +45,13 @@ module PulpContainerClient
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
-        :'content_guard' => :'content_guard',
         :'hidden' => :'hidden',
-        :'name' => :'name',
+        :'base_path' => :'base_path',
         :'pulp_labels' => :'pulp_labels',
+        :'name' => :'name',
         :'repository' => :'repository',
-        :'base_path' => :'base_path',
         :'repository_version' => :'repository_version',
+        :'content_guard' => :'content_guard',
         :'private' => :'private',
         :'description' => :'description'
       }
@@ -65,13 +65,13 @@ module PulpContainerClient
     # Attribute type mapping.
     def self.openapi_types
       {
-        :'content_guard' => :'String',
         :'hidden' => :'Boolean',
-        :'name' => :'String',
+        :'base_path' => :'String',
         :'pulp_labels' => :'Hash<String, String>',
+        :'name' => :'String',
         :'repository' => :'String',
-        :'base_path' => :'String',
         :'repository_version' => :'String',
+        :'content_guard' => :'String',
         :'private' => :'Boolean',
         :'description' => :'String'
       }
@@ -101,18 +101,14 @@ module PulpContainerClient
         h[k.to_sym] = v
       }
 
-      if attributes.key?(:'content_guard')
-        self.content_guard = attributes[:'content_guard']
-      end
-
       if attributes.key?(:'hidden')
         self.hidden = attributes[:'hidden']
       else
         self.hidden = false
       end
 
-      if attributes.key?(:'name')
-        self.name = attributes[:'name']
+      if attributes.key?(:'base_path')
+        self.base_path = attributes[:'base_path']
       end
 
       if attributes.key?(:'pulp_labels')
@@ -121,18 +117,22 @@ module PulpContainerClient
         end
       end
 
-      if attributes.key?(:'repository')
-        self.repository = attributes[:'repository']
+      if attributes.key?(:'name')
+        self.name = attributes[:'name']
       end
 
-      if attributes.key?(:'base_path')
-        self.base_path = attributes[:'base_path']
+      if attributes.key?(:'repository')
+        self.repository = attributes[:'repository']
       end
 
       if attributes.key?(:'repository_version')
         self.repository_version = attributes[:'repository_version']
       end
 
+      if attributes.key?(:'content_guard')
+        self.content_guard = attributes[:'content_guard']
+      end
+
       if attributes.key?(:'private')
         self.private = attributes[:'private']
       end
@@ -147,14 +147,14 @@ module PulpContainerClient
     def list_invalid_properties
       warn '[DEPRECATED] the `list_invalid_properties` method is obsolete'
       invalid_properties = Array.new
-      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 !@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 !@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
@@ -166,26 +166,12 @@ module PulpContainerClient
     # @return true if the model is valid
     def valid?
       warn '[DEPRECATED] the `valid?` method is obsolete'
-      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 !@name.nil? && @name.to_s.length < 1
       return false if !@description.nil? && @description.to_s.length < 1
       true
     end
 
-    # Custom attribute writer method with validation
-    # @param [Object] name Value to be assigned
-    def name=(name)
-      if name.nil?
-        fail ArgumentError, 'name cannot be nil'
-      end
-
-      if name.to_s.length < 1
-        fail ArgumentError, 'invalid value for "name", the character length must be great than or equal to 1.'
-      end
-
-      @name = name
-    end
-
     # Custom attribute writer method with validation
     # @param [Object] base_path Value to be assigned
     def base_path=(base_path)
@@ -200,6 +186,20 @@ module PulpContainerClient
       @base_path = base_path
     end
 
+    # Custom attribute writer method with validation
+    # @param [Object] name Value to be assigned
+    def name=(name)
+      if name.nil?
+        fail ArgumentError, 'name cannot be nil'
+      end
+
+      if name.to_s.length < 1
+        fail ArgumentError, 'invalid value for "name", the character length must be great than or equal to 1.'
+      end
+
+      @name = name
+    end
+
     # Custom attribute writer method with validation
     # @param [Object] description Value to be assigned
     def description=(description)
@@ -215,13 +215,13 @@ module PulpContainerClient
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
-          content_guard == o.content_guard &&
           hidden == o.hidden &&
-          name == o.name &&
+          base_path == o.base_path &&
           pulp_labels == o.pulp_labels &&
+          name == o.name &&
           repository == o.repository &&
-          base_path == o.base_path &&
           repository_version == o.repository_version &&
+          content_guard == o.content_guard &&
           private == o.private &&
           description == o.description
     end
@@ -235,7 +235,7 @@ module PulpContainerClient
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [content_guard, hidden, name, pulp_labels, repository, base_path, repository_version, private, description].hash
+      [hidden, base_path, pulp_labels, name, repository, repository_version, content_guard, private, description].hash
     end
 
     # Builds the object from hash