pulp_docker_client 4.0.0b7 → 4.0.0b8.dev01573482113

data/lib/pulp_docker_client/models/{docker_remote.rb → docker_docker_remote.rb}

@@ -6,20 +6,18 @@
 The version of the OpenAPI document: v3
 
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 4.1.3-SNAPSHOT
+OpenAPI Generator version: 4.2.1-SNAPSHOT
 
 =end
 
 require 'date'
 
 module PulpDockerClient
-  class DockerRemote
-    attr_accessor :_href
+  class DockerDockerRemote
+    attr_accessor :pulp_href
 
     # Timestamp of creation.
-    attr_accessor :_created
-
-    attr_accessor :_type
+    attr_accessor :pulp_created
 
     # A unique name for this remote.
     attr_accessor :name
@@ -42,14 +40,8 @@ module PulpDockerClient
     # The proxy URL. Format: scheme://user:password@host:port
     attr_accessor :proxy_url
 
-    # The username to be used for authentication when syncing.
-    attr_accessor :username
-
-    # The password to be used for authentication when syncing.
-    attr_accessor :password
-
     # Timestamp of the most recent update of the remote.
-    attr_accessor :_last_updated
+    attr_accessor :pulp_last_updated
 
     # Total number of simultaneous connections.
     attr_accessor :download_concurrency
@@ -60,7 +52,7 @@ module PulpDockerClient
     # Name of the upstream repository
     attr_accessor :upstream_name
 
-    # A comma separated string of tags to sync.         Example:          latest,1.27.0         
+    # A list of whitelisted tags to sync
     attr_accessor :whitelist_tags
 
     class EnumAttributeValidator
@@ -88,9 +80,8 @@ module PulpDockerClient
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
-        :'_href' => :'_href',
-        :'_created' => :'_created',
-        :'_type' => :'_type',
+        :'pulp_href' => :'pulp_href',
+        :'pulp_created' => :'pulp_created',
         :'name' => :'name',
         :'url' => :'url',
         :'ssl_ca_certificate' => :'ssl_ca_certificate',
@@ -98,9 +89,7 @@ module PulpDockerClient
         :'ssl_client_key' => :'ssl_client_key',
         :'ssl_validation' => :'ssl_validation',
         :'proxy_url' => :'proxy_url',
-        :'username' => :'username',
-        :'password' => :'password',
-        :'_last_updated' => :'_last_updated',
+        :'pulp_last_updated' => :'pulp_last_updated',
         :'download_concurrency' => :'download_concurrency',
         :'policy' => :'policy',
         :'upstream_name' => :'upstream_name',
@@ -111,9 +100,8 @@ module PulpDockerClient
     # Attribute type mapping.
     def self.openapi_types
       {
-        :'_href' => :'String',
-        :'_created' => :'DateTime',
-        :'_type' => :'String',
+        :'pulp_href' => :'String',
+        :'pulp_created' => :'DateTime',
         :'name' => :'String',
         :'url' => :'String',
         :'ssl_ca_certificate' => :'String',
@@ -121,41 +109,46 @@ module PulpDockerClient
         :'ssl_client_key' => :'String',
         :'ssl_validation' => :'Boolean',
         :'proxy_url' => :'String',
-        :'username' => :'String',
-        :'password' => :'String',
-        :'_last_updated' => :'DateTime',
+        :'pulp_last_updated' => :'DateTime',
         :'download_concurrency' => :'Integer',
         :'policy' => :'String',
         :'upstream_name' => :'String',
-        :'whitelist_tags' => :'String'
+        :'whitelist_tags' => :'Array<String>'
       }
     end
 
+    # List of attributes with nullable: true
+    def self.openapi_nullable
+      Set.new([
+        :'ssl_ca_certificate',
+        :'ssl_client_certificate',
+        :'ssl_client_key',
+        :'proxy_url',
+        :'whitelist_tags'
+      ])
+    end
+
     # Initializes the object
     # @param [Hash] attributes Model attributes in the form of hash
     def initialize(attributes = {})
       if (!attributes.is_a?(Hash))
-        fail ArgumentError, "The input argument (attributes) must be a hash in `PulpDockerClient::DockerRemote` initialize method"
+        fail ArgumentError, "The input argument (attributes) must be a hash in `PulpDockerClient::DockerDockerRemote` initialize method"
       end
 
       # check to see if the attribute exists and convert string to symbol for hash key
       attributes = attributes.each_with_object({}) { |(k, v), h|
         if (!self.class.attribute_map.key?(k.to_sym))
-          fail ArgumentError, "`#{k}` is not a valid attribute in `PulpDockerClient::DockerRemote`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
+          fail ArgumentError, "`#{k}` is not a valid attribute in `PulpDockerClient::DockerDockerRemote`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
         end
         h[k.to_sym] = v
       }
 
-      if attributes.key?(:'_href')
-        self._href = attributes[:'_href']
+      if attributes.key?(:'pulp_href')
+        self.pulp_href = attributes[:'pulp_href']
       end
 
-      if attributes.key?(:'_created')
-        self._created = attributes[:'_created']
-      end
-
-      if attributes.key?(:'_type')
-        self._type = attributes[:'_type']
+      if attributes.key?(:'pulp_created')
+        self.pulp_created = attributes[:'pulp_created']
       end
 
       if attributes.key?(:'name')
@@ -186,16 +179,8 @@ module PulpDockerClient
         self.proxy_url = attributes[:'proxy_url']
       end
 
-      if attributes.key?(:'username')
-        self.username = attributes[:'username']
-      end
-
-      if attributes.key?(:'password')
-        self.password = attributes[:'password']
-      end
-
-      if attributes.key?(:'_last_updated')
-        self._last_updated = attributes[:'_last_updated']
+      if attributes.key?(:'pulp_last_updated')
+        self.pulp_last_updated = attributes[:'pulp_last_updated']
       end
 
       if attributes.key?(:'download_concurrency')
@@ -213,7 +198,9 @@ module PulpDockerClient
       end
 
       if attributes.key?(:'whitelist_tags')
-        self.whitelist_tags = attributes[:'whitelist_tags']
+        if (value = attributes[:'whitelist_tags']).is_a?(Array)
+          self.whitelist_tags = value
+        end
       end
     end
 
@@ -221,10 +208,6 @@ module PulpDockerClient
     # @return Array for valid properties with the reasons
     def list_invalid_properties
       invalid_properties = Array.new
-      if !@_type.nil? && @_type.to_s.length < 1
-        invalid_properties.push('invalid value for "_type", 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
@@ -257,14 +240,6 @@ module PulpDockerClient
         invalid_properties.push('invalid value for "proxy_url", the character length must be great than or equal to 1.')
       end
 
-      if !@username.nil? && @username.to_s.length < 1
-        invalid_properties.push('invalid value for "username", the character length must be great than or equal to 1.')
-      end
-
-      if !@password.nil? && @password.to_s.length < 1
-        invalid_properties.push('invalid value for "password", the character length must be great than or equal to 1.')
-      end
-
       if !@download_concurrency.nil? && @download_concurrency < 1
         invalid_properties.push('invalid value for "download_concurrency", must be greater than or equal to 1.')
       end
@@ -277,17 +252,12 @@ module PulpDockerClient
         invalid_properties.push('invalid value for "upstream_name", the character length must be great than or equal to 1.')
       end
 
-      if !@whitelist_tags.nil? && @whitelist_tags.to_s.length < 1
-        invalid_properties.push('invalid value for "whitelist_tags", 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 !@_type.nil? && @_type.to_s.length < 1
       return false if @name.nil?
       return false if @name.to_s.length < 1
       return false if @url.nil?
@@ -296,27 +266,14 @@ module PulpDockerClient
       return false if !@ssl_client_certificate.nil? && @ssl_client_certificate.to_s.length < 1
       return false if !@ssl_client_key.nil? && @ssl_client_key.to_s.length < 1
       return false if !@proxy_url.nil? && @proxy_url.to_s.length < 1
-      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
       policy_validator = EnumAttributeValidator.new('String', ["immediate", "on_demand", "streamed"])
       return false unless policy_validator.valid?(@policy)
       return false if @upstream_name.nil?
       return false if @upstream_name.to_s.length < 1
-      return false if !@whitelist_tags.nil? && @whitelist_tags.to_s.length < 1
       true
     end
 
-    # Custom attribute writer method with validation
-    # @param [Object] _type Value to be assigned
-    def _type=(_type)
-      if !_type.nil? && _type.to_s.length < 1
-        fail ArgumentError, 'invalid value for "_type", the character length must be great than or equal to 1.'
-      end
-
-      @_type = _type
-    end
-
     # Custom attribute writer method with validation
     # @param [Object] name Value to be assigned
     def name=(name)
@@ -385,26 +342,6 @@ module PulpDockerClient
       @proxy_url = proxy_url
     end
 
-    # Custom attribute writer method with validation
-    # @param [Object] username Value to be assigned
-    def username=(username)
-      if !username.nil? && username.to_s.length < 1
-        fail ArgumentError, 'invalid value for "username", the character length must be great than or equal to 1.'
-      end
-
-      @username = username
-    end
-
-    # Custom attribute writer method with validation
-    # @param [Object] password Value to be assigned
-    def password=(password)
-      if !password.nil? && password.to_s.length < 1
-        fail ArgumentError, 'invalid value for "password", the character length must be great than or equal to 1.'
-      end
-
-      @password = password
-    end
-
     # Custom attribute writer method with validation
     # @param [Object] download_concurrency Value to be assigned
     def download_concurrency=(download_concurrency)
@@ -439,24 +376,13 @@ module PulpDockerClient
       @upstream_name = upstream_name
     end
 
-    # Custom attribute writer method with validation
-    # @param [Object] whitelist_tags Value to be assigned
-    def whitelist_tags=(whitelist_tags)
-      if !whitelist_tags.nil? && whitelist_tags.to_s.length < 1
-        fail ArgumentError, 'invalid value for "whitelist_tags", the character length must be great than or equal to 1.'
-      end
-
-      @whitelist_tags = whitelist_tags
-    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 &&
-          _href == o._href &&
-          _created == o._created &&
-          _type == o._type &&
+          pulp_href == o.pulp_href &&
+          pulp_created == o.pulp_created &&
           name == o.name &&
           url == o.url &&
           ssl_ca_certificate == o.ssl_ca_certificate &&
@@ -464,9 +390,7 @@ module PulpDockerClient
           ssl_client_key == o.ssl_client_key &&
           ssl_validation == o.ssl_validation &&
           proxy_url == o.proxy_url &&
-          username == o.username &&
-          password == o.password &&
-          _last_updated == o._last_updated &&
+          pulp_last_updated == o.pulp_last_updated &&
           download_concurrency == o.download_concurrency &&
           policy == o.policy &&
           upstream_name == o.upstream_name &&
@@ -482,7 +406,7 @@ module PulpDockerClient
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [_href, _created, _type, name, url, ssl_ca_certificate, ssl_client_certificate, ssl_client_key, ssl_validation, proxy_url, username, password, _last_updated, download_concurrency, policy, upstream_name, whitelist_tags].hash
+      [pulp_href, pulp_created, name, url, ssl_ca_certificate, ssl_client_certificate, ssl_client_key, ssl_validation, proxy_url, pulp_last_updated, download_concurrency, policy, upstream_name, whitelist_tags].hash
     end
 
     # Builds the object from hash
@@ -571,7 +495,11 @@ module PulpDockerClient
       hash = {}
       self.class.attribute_map.each_pair do |attr, param|
         value = self.send(attr)
-        next if value.nil?
+        if value.nil?
+          is_nullable = self.class.openapi_nullable.include?(attr)
+          next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
+        end
+        
         hash[param] = _to_hash(value)
       end
       hash

data/lib/pulp_docker_client/models/{manifest.rb → docker_manifest.rb}

@@ -6,27 +6,22 @@
 The version of the OpenAPI document: v3
 
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 4.1.3-SNAPSHOT
+OpenAPI Generator version: 4.2.1-SNAPSHOT
 
 =end
 
 require 'date'
 
 module PulpDockerClient
-  class Manifest
-    attr_accessor :_href
+  class DockerManifest
+    attr_accessor :pulp_href
 
     # Timestamp of creation.
-    attr_accessor :_created
-
-    attr_accessor :_type
+    attr_accessor :pulp_created
 
     # Artifact file representing the physical content
     attr_accessor :artifact
 
-    # Path where the artifact is located relative to distributions base_path
-    attr_accessor :relative_path
-
     # sha256 of the Manifest file
     attr_accessor :digest
 
@@ -48,11 +43,9 @@ module PulpDockerClient
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
-        :'_href' => :'_href',
-        :'_created' => :'_created',
-        :'_type' => :'_type',
+        :'pulp_href' => :'pulp_href',
+        :'pulp_created' => :'pulp_created',
         :'artifact' => :'artifact',
-        :'relative_path' => :'relative_path',
         :'digest' => :'digest',
         :'schema_version' => :'schema_version',
         :'media_type' => :'media_type',
@@ -65,11 +58,9 @@ module PulpDockerClient
     # Attribute type mapping.
     def self.openapi_types
       {
-        :'_href' => :'String',
-        :'_created' => :'DateTime',
-        :'_type' => :'String',
+        :'pulp_href' => :'String',
+        :'pulp_created' => :'DateTime',
         :'artifact' => :'String',
-        :'relative_path' => :'String',
         :'digest' => :'String',
         :'schema_version' => :'Integer',
         :'media_type' => :'String',
@@ -79,41 +70,39 @@ module PulpDockerClient
       }
     end
 
+    # List of attributes with nullable: true
+    def self.openapi_nullable
+      Set.new([
+      ])
+    end
+
     # Initializes the object
     # @param [Hash] attributes Model attributes in the form of hash
     def initialize(attributes = {})
       if (!attributes.is_a?(Hash))
-        fail ArgumentError, "The input argument (attributes) must be a hash in `PulpDockerClient::Manifest` initialize method"
+        fail ArgumentError, "The input argument (attributes) must be a hash in `PulpDockerClient::DockerManifest` initialize method"
       end
 
       # check to see if the attribute exists and convert string to symbol for hash key
       attributes = attributes.each_with_object({}) { |(k, v), h|
         if (!self.class.attribute_map.key?(k.to_sym))
-          fail ArgumentError, "`#{k}` is not a valid attribute in `PulpDockerClient::Manifest`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
+          fail ArgumentError, "`#{k}` is not a valid attribute in `PulpDockerClient::DockerManifest`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
         end
         h[k.to_sym] = v
       }
 
-      if attributes.key?(:'_href')
-        self._href = attributes[:'_href']
+      if attributes.key?(:'pulp_href')
+        self.pulp_href = attributes[:'pulp_href']
       end
 
-      if attributes.key?(:'_created')
-        self._created = attributes[:'_created']
-      end
-
-      if attributes.key?(:'_type')
-        self._type = attributes[:'_type']
+      if attributes.key?(:'pulp_created')
+        self.pulp_created = attributes[:'pulp_created']
       end
 
       if attributes.key?(:'artifact')
         self.artifact = attributes[:'artifact']
       end
 
-      if attributes.key?(:'relative_path')
-        self.relative_path = attributes[:'relative_path']
-      end
-
       if attributes.key?(:'digest')
         self.digest = attributes[:'digest']
       end
@@ -147,22 +136,10 @@ module PulpDockerClient
     # @return Array for valid properties with the reasons
     def list_invalid_properties
       invalid_properties = Array.new
-      if !@_type.nil? && @_type.to_s.length < 1
-        invalid_properties.push('invalid value for "_type", the character length must be great than or equal to 1.')
-      end
-
       if @artifact.nil?
         invalid_properties.push('invalid value for "artifact", artifact cannot be nil.')
       end
 
-      if @relative_path.nil?
-        invalid_properties.push('invalid value for "relative_path", relative_path cannot be nil.')
-      end
-
-      if @relative_path.to_s.length < 1
-        invalid_properties.push('invalid value for "relative_path", the character length must be great than or equal to 1.')
-      end
-
       if @digest.nil?
         invalid_properties.push('invalid value for "digest", digest cannot be nil.')
       end
@@ -201,10 +178,7 @@ module PulpDockerClient
     # 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 !@_type.nil? && @_type.to_s.length < 1
       return false if @artifact.nil?
-      return false if @relative_path.nil?
-      return false if @relative_path.to_s.length < 1
       return false if @digest.nil?
       return false if @digest.to_s.length < 1
       return false if @schema_version.nil?
@@ -216,30 +190,6 @@ module PulpDockerClient
       true
     end
 
-    # Custom attribute writer method with validation
-    # @param [Object] _type Value to be assigned
-    def _type=(_type)
-      if !_type.nil? && _type.to_s.length < 1
-        fail ArgumentError, 'invalid value for "_type", the character length must be great than or equal to 1.'
-      end
-
-      @_type = _type
-    end
-
-    # Custom attribute writer method with validation
-    # @param [Object] relative_path Value to be assigned
-    def relative_path=(relative_path)
-      if relative_path.nil?
-        fail ArgumentError, 'relative_path cannot be nil'
-      end
-
-      if relative_path.to_s.length < 1
-        fail ArgumentError, 'invalid value for "relative_path", the character length must be great than or equal to 1.'
-      end
-
-      @relative_path = relative_path
-    end
-
     # Custom attribute writer method with validation
     # @param [Object] digest Value to be assigned
     def digest=(digest)
@@ -273,11 +223,9 @@ module PulpDockerClient
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
-          _href == o._href &&
-          _created == o._created &&
-          _type == o._type &&
+          pulp_href == o.pulp_href &&
+          pulp_created == o.pulp_created &&
           artifact == o.artifact &&
-          relative_path == o.relative_path &&
           digest == o.digest &&
           schema_version == o.schema_version &&
           media_type == o.media_type &&
@@ -295,7 +243,7 @@ module PulpDockerClient
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [_href, _created, _type, artifact, relative_path, digest, schema_version, media_type, listed_manifests, config_blob, blobs].hash
+      [pulp_href, pulp_created, artifact, digest, schema_version, media_type, listed_manifests, config_blob, blobs].hash
     end
 
     # Builds the object from hash
@@ -384,7 +332,11 @@ module PulpDockerClient
       hash = {}
       self.class.attribute_map.each_pair do |attr, param|
         value = self.send(attr)
-        next if value.nil?
+        if value.nil?
+          is_nullable = self.class.openapi_nullable.include?(attr)
+          next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
+        end
+        
         hash[param] = _to_hash(value)
       end
       hash