pulp_container_client 2.18.0 → 2.18.1

data/lib/pulp_container_client/models/container_container_distribution_response.rb

@@ -18,16 +18,10 @@ 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
+    attr_accessor :pulp_labels
 
     attr_accessor :pulp_href
 
-    # Whether this distribution should be shown in the content app.
-    attr_accessor :hidden
-
-    attr_accessor :pulp_labels
-
     # A unique name. Ex, `rawhide` and `stable`.
     attr_accessor :name
 
@@ -37,6 +31,12 @@ module PulpContainerClient
     # Timestamp of creation.
     attr_accessor :pulp_created
 
+    # 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
+
+    # Whether this distribution should be shown in the content app.
+    attr_accessor :hidden
+
     # RepositoryVersion to be served
     attr_accessor :repository_version
 
@@ -59,13 +59,13 @@ module PulpContainerClient
     def self.attribute_map
       {
         :'content_guard' => :'content_guard',
-        :'base_path' => :'base_path',
-        :'pulp_href' => :'pulp_href',
-        :'hidden' => :'hidden',
         :'pulp_labels' => :'pulp_labels',
+        :'pulp_href' => :'pulp_href',
         :'name' => :'name',
         :'repository' => :'repository',
         :'pulp_created' => :'pulp_created',
+        :'base_path' => :'base_path',
+        :'hidden' => :'hidden',
         :'repository_version' => :'repository_version',
         :'registry_path' => :'registry_path',
         :'remote' => :'remote',
@@ -79,13 +79,13 @@ module PulpContainerClient
     def self.openapi_types
       {
         :'content_guard' => :'String',
-        :'base_path' => :'String',
-        :'pulp_href' => :'String',
-        :'hidden' => :'Boolean',
         :'pulp_labels' => :'Hash<String, String>',
+        :'pulp_href' => :'String',
         :'name' => :'String',
         :'repository' => :'String',
         :'pulp_created' => :'DateTime',
+        :'base_path' => :'String',
+        :'hidden' => :'Boolean',
         :'repository_version' => :'String',
         :'registry_path' => :'String',
         :'remote' => :'String',
@@ -123,26 +123,16 @@ module PulpContainerClient
         self.content_guard = attributes[:'content_guard']
       end
 
-      if attributes.key?(:'base_path')
-        self.base_path = attributes[:'base_path']
-      end
-
-      if attributes.key?(:'pulp_href')
-        self.pulp_href = attributes[:'pulp_href']
-      end
-
-      if attributes.key?(:'hidden')
-        self.hidden = attributes[:'hidden']
-      else
-        self.hidden = false
-      end
-
       if attributes.key?(:'pulp_labels')
         if (value = attributes[:'pulp_labels']).is_a?(Hash)
           self.pulp_labels = value
         end
       end
 
+      if attributes.key?(:'pulp_href')
+        self.pulp_href = attributes[:'pulp_href']
+      end
+
       if attributes.key?(:'name')
         self.name = attributes[:'name']
       end
@@ -155,6 +145,16 @@ module PulpContainerClient
         self.pulp_created = attributes[:'pulp_created']
       end
 
+      if attributes.key?(:'base_path')
+        self.base_path = attributes[:'base_path']
+      end
+
+      if attributes.key?(:'hidden')
+        self.hidden = attributes[:'hidden']
+      else
+        self.hidden = false
+      end
+
       if attributes.key?(:'repository_version')
         self.repository_version = attributes[:'repository_version']
       end
@@ -184,22 +184,22 @@ module PulpContainerClient
     # @return Array for valid properties with the reasons
     def list_invalid_properties
       invalid_properties = Array.new
-      if @base_path.nil?
-        invalid_properties.push('invalid value for "base_path", base_path cannot be nil.')
-      end
-
       if @name.nil?
         invalid_properties.push('invalid value for "name", name cannot be nil.')
       end
 
+      if @base_path.nil?
+        invalid_properties.push('invalid value for "base_path", base_path cannot be nil.')
+      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 @base_path.nil?
       return false if @name.nil?
+      return false if @base_path.nil?
       true
     end
 
@@ -209,13 +209,13 @@ module PulpContainerClient
       return true if self.equal?(o)
       self.class == o.class &&
           content_guard == o.content_guard &&
-          base_path == o.base_path &&
-          pulp_href == o.pulp_href &&
-          hidden == o.hidden &&
           pulp_labels == o.pulp_labels &&
+          pulp_href == o.pulp_href &&
           name == o.name &&
           repository == o.repository &&
           pulp_created == o.pulp_created &&
+          base_path == o.base_path &&
+          hidden == o.hidden &&
           repository_version == o.repository_version &&
           registry_path == o.registry_path &&
           remote == o.remote &&
@@ -233,7 +233,7 @@ module PulpContainerClient
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [content_guard, base_path, pulp_href, hidden, pulp_labels, name, repository, pulp_created, repository_version, registry_path, remote, namespace, private, description].hash
+      [content_guard, pulp_labels, pulp_href, name, repository, pulp_created, base_path, hidden, repository_version, registry_path, remote, namespace, private, description].hash
     end
 
     # Builds the object from hash

data/lib/pulp_container_client/models/container_container_pull_through_distribution.rb

@@ -18,12 +18,6 @@ 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
-
-    # Whether this distribution should be shown in the content app.
-    attr_accessor :hidden
-
     attr_accessor :pulp_labels
 
     # A unique name. Ex, `rawhide` and `stable`.
@@ -32,6 +26,12 @@ module PulpContainerClient
     # 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
+
+    # Whether this distribution should be shown in the content app.
+    attr_accessor :hidden
+
     # Remote that can be used to fetch content when using pull-through caching.
     attr_accessor :remote
 
@@ -48,11 +48,11 @@ module PulpContainerClient
     def self.attribute_map
       {
         :'content_guard' => :'content_guard',
-        :'base_path' => :'base_path',
-        :'hidden' => :'hidden',
         :'pulp_labels' => :'pulp_labels',
         :'name' => :'name',
         :'repository' => :'repository',
+        :'base_path' => :'base_path',
+        :'hidden' => :'hidden',
         :'remote' => :'remote',
         :'distributions' => :'distributions',
         :'private' => :'private',
@@ -64,11 +64,11 @@ module PulpContainerClient
     def self.openapi_types
       {
         :'content_guard' => :'String',
-        :'base_path' => :'String',
-        :'hidden' => :'Boolean',
         :'pulp_labels' => :'Hash<String, String>',
         :'name' => :'String',
         :'repository' => :'String',
+        :'base_path' => :'String',
+        :'hidden' => :'Boolean',
         :'remote' => :'String',
         :'distributions' => :'Array<String>',
         :'private' => :'Boolean',
@@ -103,16 +103,6 @@ module PulpContainerClient
         self.content_guard = attributes[:'content_guard']
       end
 
-      if attributes.key?(:'base_path')
-        self.base_path = attributes[:'base_path']
-      end
-
-      if attributes.key?(:'hidden')
-        self.hidden = attributes[:'hidden']
-      else
-        self.hidden = false
-      end
-
       if attributes.key?(:'pulp_labels')
         if (value = attributes[:'pulp_labels']).is_a?(Hash)
           self.pulp_labels = value
@@ -127,6 +117,16 @@ module PulpContainerClient
         self.repository = attributes[:'repository']
       end
 
+      if attributes.key?(:'base_path')
+        self.base_path = attributes[:'base_path']
+      end
+
+      if attributes.key?(:'hidden')
+        self.hidden = attributes[:'hidden']
+      else
+        self.hidden = false
+      end
+
       if attributes.key?(:'remote')
         self.remote = attributes[:'remote']
       end
@@ -150,14 +150,6 @@ module PulpContainerClient
     # @return Array for valid properties with the reasons
     def list_invalid_properties
       invalid_properties = Array.new
-      if @base_path.nil?
-        invalid_properties.push('invalid value for "base_path", base_path cannot be nil.')
-      end
-
-      if @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?
         invalid_properties.push('invalid value for "name", name cannot be nil.')
       end
@@ -166,6 +158,14 @@ module PulpContainerClient
         invalid_properties.push('invalid value for "name", the character length must be great than or equal to 1.')
       end
 
+      if @base_path.nil?
+        invalid_properties.push('invalid value for "base_path", base_path cannot be nil.')
+      end
+
+      if @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 @remote.nil?
         invalid_properties.push('invalid value for "remote", remote cannot be nil.')
       end
@@ -180,29 +180,15 @@ 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?
-      return false if @base_path.to_s.length < 1
       return false if @name.nil?
       return false if @name.to_s.length < 1
+      return false if @base_path.nil?
+      return false if @base_path.to_s.length < 1
       return false if @remote.nil?
       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?
-        fail ArgumentError, 'base_path cannot be nil'
-      end
-
-      if 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)
@@ -217,6 +203,20 @@ 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?
+        fail ArgumentError, 'base_path cannot be nil'
+      end
+
+      if 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)
@@ -233,11 +233,11 @@ module PulpContainerClient
       return true if self.equal?(o)
       self.class == o.class &&
           content_guard == o.content_guard &&
-          base_path == o.base_path &&
-          hidden == o.hidden &&
           pulp_labels == o.pulp_labels &&
           name == o.name &&
           repository == o.repository &&
+          base_path == o.base_path &&
+          hidden == o.hidden &&
           remote == o.remote &&
           distributions == o.distributions &&
           private == o.private &&
@@ -253,7 +253,7 @@ module PulpContainerClient
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [content_guard, base_path, hidden, pulp_labels, name, repository, remote, distributions, private, description].hash
+      [content_guard, pulp_labels, name, repository, base_path, hidden, remote, distributions, private, description].hash
     end
 
     # Builds the object from hash

data/lib/pulp_container_client/models/container_container_pull_through_distribution_response.rb

@@ -18,16 +18,10 @@ 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
+    attr_accessor :pulp_labels
 
     attr_accessor :pulp_href
 
-    # Whether this distribution should be shown in the content app.
-    attr_accessor :hidden
-
-    attr_accessor :pulp_labels
-
     # A unique name. Ex, `rawhide` and `stable`.
     attr_accessor :name
 
@@ -37,6 +31,12 @@ module PulpContainerClient
     # Timestamp of creation.
     attr_accessor :pulp_created
 
+    # 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
+
+    # Whether this distribution should be shown in the content app.
+    attr_accessor :hidden
+
     # Remote that can be used to fetch content when using pull-through caching.
     attr_accessor :remote
 
@@ -56,13 +56,13 @@ module PulpContainerClient
     def self.attribute_map
       {
         :'content_guard' => :'content_guard',
-        :'base_path' => :'base_path',
-        :'pulp_href' => :'pulp_href',
-        :'hidden' => :'hidden',
         :'pulp_labels' => :'pulp_labels',
+        :'pulp_href' => :'pulp_href',
         :'name' => :'name',
         :'repository' => :'repository',
         :'pulp_created' => :'pulp_created',
+        :'base_path' => :'base_path',
+        :'hidden' => :'hidden',
         :'remote' => :'remote',
         :'distributions' => :'distributions',
         :'namespace' => :'namespace',
@@ -75,13 +75,13 @@ module PulpContainerClient
     def self.openapi_types
       {
         :'content_guard' => :'String',
-        :'base_path' => :'String',
-        :'pulp_href' => :'String',
-        :'hidden' => :'Boolean',
         :'pulp_labels' => :'Hash<String, String>',
+        :'pulp_href' => :'String',
         :'name' => :'String',
         :'repository' => :'String',
         :'pulp_created' => :'DateTime',
+        :'base_path' => :'String',
+        :'hidden' => :'Boolean',
         :'remote' => :'String',
         :'distributions' => :'Array<String>',
         :'namespace' => :'String',
@@ -117,26 +117,16 @@ module PulpContainerClient
         self.content_guard = attributes[:'content_guard']
       end
 
-      if attributes.key?(:'base_path')
-        self.base_path = attributes[:'base_path']
-      end
-
-      if attributes.key?(:'pulp_href')
-        self.pulp_href = attributes[:'pulp_href']
-      end
-
-      if attributes.key?(:'hidden')
-        self.hidden = attributes[:'hidden']
-      else
-        self.hidden = false
-      end
-
       if attributes.key?(:'pulp_labels')
         if (value = attributes[:'pulp_labels']).is_a?(Hash)
           self.pulp_labels = value
         end
       end
 
+      if attributes.key?(:'pulp_href')
+        self.pulp_href = attributes[:'pulp_href']
+      end
+
       if attributes.key?(:'name')
         self.name = attributes[:'name']
       end
@@ -149,6 +139,16 @@ module PulpContainerClient
         self.pulp_created = attributes[:'pulp_created']
       end
 
+      if attributes.key?(:'base_path')
+        self.base_path = attributes[:'base_path']
+      end
+
+      if attributes.key?(:'hidden')
+        self.hidden = attributes[:'hidden']
+      else
+        self.hidden = false
+      end
+
       if attributes.key?(:'remote')
         self.remote = attributes[:'remote']
       end
@@ -176,14 +176,14 @@ module PulpContainerClient
     # @return Array for valid properties with the reasons
     def list_invalid_properties
       invalid_properties = Array.new
-      if @base_path.nil?
-        invalid_properties.push('invalid value for "base_path", base_path cannot be nil.')
-      end
-
       if @name.nil?
         invalid_properties.push('invalid value for "name", name cannot be nil.')
       end
 
+      if @base_path.nil?
+        invalid_properties.push('invalid value for "base_path", base_path cannot be nil.')
+      end
+
       if @remote.nil?
         invalid_properties.push('invalid value for "remote", remote cannot be nil.')
       end
@@ -194,8 +194,8 @@ 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?
       return false if @name.nil?
+      return false if @base_path.nil?
       return false if @remote.nil?
       true
     end
@@ -206,13 +206,13 @@ module PulpContainerClient
       return true if self.equal?(o)
       self.class == o.class &&
           content_guard == o.content_guard &&
-          base_path == o.base_path &&
-          pulp_href == o.pulp_href &&
-          hidden == o.hidden &&
           pulp_labels == o.pulp_labels &&
+          pulp_href == o.pulp_href &&
           name == o.name &&
           repository == o.repository &&
           pulp_created == o.pulp_created &&
+          base_path == o.base_path &&
+          hidden == o.hidden &&
           remote == o.remote &&
           distributions == o.distributions &&
           namespace == o.namespace &&
@@ -229,7 +229,7 @@ module PulpContainerClient
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [content_guard, base_path, pulp_href, hidden, pulp_labels, name, repository, pulp_created, remote, distributions, namespace, private, description].hash
+      [content_guard, pulp_labels, pulp_href, name, repository, pulp_created, base_path, hidden, remote, distributions, namespace, private, description].hash
     end
 
     # Builds the object from hash

data/lib/pulp_container_client/models/container_container_push_repository.rb

@@ -18,25 +18,25 @@ module PulpContainerClient
     # A reference to an associated signing service.
     attr_accessor :manifest_signing_service
 
-    # A unique name for this repository.
-    attr_accessor :name
+    attr_accessor :pulp_labels
 
     # 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
+
     # An optional description.
     attr_accessor :description
 
-    attr_accessor :pulp_labels
-
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
         :'manifest_signing_service' => :'manifest_signing_service',
-        :'name' => :'name',
+        :'pulp_labels' => :'pulp_labels',
         :'retain_repo_versions' => :'retain_repo_versions',
-        :'description' => :'description',
-        :'pulp_labels' => :'pulp_labels'
+        :'name' => :'name',
+        :'description' => :'description'
       }
     end
 
@@ -44,10 +44,10 @@ module PulpContainerClient
     def self.openapi_types
       {
         :'manifest_signing_service' => :'String',
-        :'name' => :'String',
+        :'pulp_labels' => :'Hash<String, String>',
         :'retain_repo_versions' => :'Integer',
-        :'description' => :'String',
-        :'pulp_labels' => :'Hash<String, String>'
+        :'name' => :'String',
+        :'description' => :'String'
       }
     end
 
@@ -56,7 +56,7 @@ module PulpContainerClient
       Set.new([
         :'manifest_signing_service',
         :'retain_repo_versions',
-        :'description',
+        :'description'
       ])
     end
 
@@ -79,22 +79,22 @@ module PulpContainerClient
         self.manifest_signing_service = attributes[:'manifest_signing_service']
       end
 
-      if attributes.key?(:'name')
-        self.name = attributes[:'name']
+      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']
       end
 
-      if attributes.key?(:'description')
-        self.description = attributes[:'description']
+      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
+      if attributes.key?(:'description')
+        self.description = attributes[:'description']
       end
     end
 
@@ -102,6 +102,10 @@ module PulpContainerClient
     # @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?
         invalid_properties.push('invalid value for "name", name cannot be nil.')
       end
@@ -110,10 +114,6 @@ module PulpContainerClient
         invalid_properties.push('invalid value for "name", 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
-
       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
@@ -124,13 +124,23 @@ 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 !@retain_repo_versions.nil? && @retain_repo_versions < 1
       return false if @name.nil?
       return false if @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] 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)
@@ -145,16 +155,6 @@ module PulpContainerClient
       @name = name
     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] description Value to be assigned
     def description=(description)
@@ -171,10 +171,10 @@ module PulpContainerClient
       return true if self.equal?(o)
       self.class == o.class &&
           manifest_signing_service == o.manifest_signing_service &&
-          name == o.name &&
+          pulp_labels == o.pulp_labels &&
           retain_repo_versions == o.retain_repo_versions &&
-          description == o.description &&
-          pulp_labels == o.pulp_labels
+          name == o.name &&
+          description == o.description
     end
 
     # @see the `==` method
@@ -186,7 +186,7 @@ module PulpContainerClient
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [manifest_signing_service, name, retain_repo_versions, description, pulp_labels].hash
+      [manifest_signing_service, pulp_labels, retain_repo_versions, name, description].hash
     end
 
     # Builds the object from hash