pulp_npm_client 0.5.0 → 0.6.0

data/lib/pulp_npm_client/models/npm_npm_remote.rb

@@ -14,7 +14,7 @@ require 'date'
 require 'time'
 
 module PulpNpmClient
-  # A Serializer for NpmRemote.  Add any new fields if defined on NpmRemote. Similar to the example above, in PackageSerializer. Additional validators can be added to the parent validators list  For example::  class Meta:     validators = core_serializers.RemoteSerializer.Meta.validators + [myValidator1, ...]  By default the 'policy' field in core_serializers.RemoteSerializer only validates the choice 'immediate'. To add on-demand support for more 'policy' options, e.g. 'streamed' or 'on_demand', re-define the 'policy' option as follows::
+  # A Serializer for NpmRemote.  Add any new fields if defined on NpmRemote. Similar to the example above, in NpmPackageSerializer. Additional validators can be added to the parent validators list  For example::  class Meta:     validators = core_serializers.RemoteSerializer.Meta.validators + [myValidator1, ...]  By default the 'policy' field in core_serializers.RemoteSerializer only validates the choice 'immediate'. To add on-demand support for more 'policy' options, e.g. 'streamed' or 'on_demand', re-define the 'policy' option as follows::
   class NpmNpmRemote
     # A unique name for this remote.
     attr_accessor :name
@@ -22,6 +22,11 @@ module PulpNpmClient
     # The URL of an external content source.
     attr_accessor :url
 
+    attr_accessor :pulp_labels
+
+    # The policy to use when downloading content. The possible values include: 'immediate', 'on_demand', and 'streamed'. 'immediate' is the default.  * `immediate` - When syncing, download all metadata and content now. * `on_demand` - When syncing, download metadata, but do not download content now. Instead, download content as clients request it, and save it in Pulp to be served for future client requests. * `streamed` - When syncing, download metadata, but do not download content now. Instead,download content as clients request it, but never save it in Pulp. This causes future requests for that same content to have to be downloaded again.
+    attr_accessor :policy
+
     # A PEM encoded CA certificate used to validate the server certificate presented by the remote server.
     attr_accessor :ca_cert
 
@@ -49,17 +54,9 @@ module PulpNpmClient
     # The password to be used for authentication when syncing. Extra leading and trailing whitespace characters are not trimmed.
     attr_accessor :password
 
-    attr_accessor :pulp_labels
-
-    # Total number of simultaneous connections. If not set then the default value will be used.
-    attr_accessor :download_concurrency
-
     # Maximum number of retry attempts after a download failure. If not set then the default value (3) will be used.
     attr_accessor :max_retries
 
-    # The policy to use when downloading content. The possible values include: 'immediate', 'on_demand', and 'streamed'. 'immediate' is the default.  * `immediate` - When syncing, download all metadata and content now. * `on_demand` - When syncing, download metadata, but do not download content now. Instead, download content as clients request it, and save it in Pulp to be served for future client requests. * `streamed` - When syncing, download metadata, but do not download content now. Instead,download content as clients request it, but never save it in Pulp. This causes future requests for that same content to have to be downloaded again.
-    attr_accessor :policy
-
     # aiohttp.ClientTimeout.total (q.v.) for download-connections. The default is null, which will cause the default from the aiohttp library to be used.
     attr_accessor :total_timeout
 
@@ -75,6 +72,9 @@ module PulpNpmClient
     # Headers for aiohttp.Clientsession
     attr_accessor :headers
 
+    # Total number of simultaneous connections. If not set then the default value will be used.
+    attr_accessor :download_concurrency
+
     # Limits requests per second for each concurrent downloader
     attr_accessor :rate_limit
 
@@ -105,6 +105,8 @@ module PulpNpmClient
       {
         :'name' => :'name',
         :'url' => :'url',
+        :'pulp_labels' => :'pulp_labels',
+        :'policy' => :'policy',
         :'ca_cert' => :'ca_cert',
         :'client_cert' => :'client_cert',
         :'client_key' => :'client_key',
@@ -114,15 +116,13 @@ module PulpNpmClient
         :'proxy_password' => :'proxy_password',
         :'username' => :'username',
         :'password' => :'password',
-        :'pulp_labels' => :'pulp_labels',
-        :'download_concurrency' => :'download_concurrency',
         :'max_retries' => :'max_retries',
-        :'policy' => :'policy',
         :'total_timeout' => :'total_timeout',
         :'connect_timeout' => :'connect_timeout',
         :'sock_connect_timeout' => :'sock_connect_timeout',
         :'sock_read_timeout' => :'sock_read_timeout',
         :'headers' => :'headers',
+        :'download_concurrency' => :'download_concurrency',
         :'rate_limit' => :'rate_limit'
       }
     end
@@ -137,6 +137,8 @@ module PulpNpmClient
       {
         :'name' => :'String',
         :'url' => :'String',
+        :'pulp_labels' => :'Hash<String, String>',
+        :'policy' => :'PolicyEnum',
         :'ca_cert' => :'String',
         :'client_cert' => :'String',
         :'client_key' => :'String',
@@ -146,15 +148,13 @@ module PulpNpmClient
         :'proxy_password' => :'String',
         :'username' => :'String',
         :'password' => :'String',
-        :'pulp_labels' => :'Hash<String, String>',
-        :'download_concurrency' => :'Integer',
         :'max_retries' => :'Integer',
-        :'policy' => :'PolicyEnum',
         :'total_timeout' => :'Float',
         :'connect_timeout' => :'Float',
         :'sock_connect_timeout' => :'Float',
         :'sock_read_timeout' => :'Float',
         :'headers' => :'Array<Object>',
+        :'download_concurrency' => :'Integer',
         :'rate_limit' => :'Integer'
       }
     end
@@ -170,12 +170,12 @@ module PulpNpmClient
         :'proxy_password',
         :'username',
         :'password',
-        :'download_concurrency',
         :'max_retries',
         :'total_timeout',
         :'connect_timeout',
         :'sock_connect_timeout',
         :'sock_read_timeout',
+        :'download_concurrency',
         :'rate_limit'
       ])
     end
@@ -207,6 +207,16 @@ module PulpNpmClient
         self.url = nil
       end
 
+      if attributes.key?(:'pulp_labels')
+        if (value = attributes[:'pulp_labels']).is_a?(Hash)
+          self.pulp_labels = value
+        end
+      end
+
+      if attributes.key?(:'policy')
+        self.policy = attributes[:'policy']
+      end
+
       if attributes.key?(:'ca_cert')
         self.ca_cert = attributes[:'ca_cert']
       end
@@ -243,24 +253,10 @@ module PulpNpmClient
         self.password = attributes[:'password']
       end
 
-      if attributes.key?(:'pulp_labels')
-        if (value = attributes[:'pulp_labels']).is_a?(Hash)
-          self.pulp_labels = value
-        end
-      end
-
-      if attributes.key?(:'download_concurrency')
-        self.download_concurrency = attributes[:'download_concurrency']
-      end
-
       if attributes.key?(:'max_retries')
         self.max_retries = attributes[:'max_retries']
       end
 
-      if attributes.key?(:'policy')
-        self.policy = attributes[:'policy']
-      end
-
       if attributes.key?(:'total_timeout')
         self.total_timeout = attributes[:'total_timeout']
       end
@@ -283,6 +279,10 @@ module PulpNpmClient
         end
       end
 
+      if attributes.key?(:'download_concurrency')
+        self.download_concurrency = attributes[:'download_concurrency']
+      end
+
       if attributes.key?(:'rate_limit')
         self.rate_limit = attributes[:'rate_limit']
       end
@@ -538,6 +538,8 @@ module PulpNpmClient
       self.class == o.class &&
           name == o.name &&
           url == o.url &&
+          pulp_labels == o.pulp_labels &&
+          policy == o.policy &&
           ca_cert == o.ca_cert &&
           client_cert == o.client_cert &&
           client_key == o.client_key &&
@@ -547,15 +549,13 @@ module PulpNpmClient
           proxy_password == o.proxy_password &&
           username == o.username &&
           password == o.password &&
-          pulp_labels == o.pulp_labels &&
-          download_concurrency == o.download_concurrency &&
           max_retries == o.max_retries &&
-          policy == o.policy &&
           total_timeout == o.total_timeout &&
           connect_timeout == o.connect_timeout &&
           sock_connect_timeout == o.sock_connect_timeout &&
           sock_read_timeout == o.sock_read_timeout &&
           headers == o.headers &&
+          download_concurrency == o.download_concurrency &&
           rate_limit == o.rate_limit
     end
 
@@ -568,7 +568,7 @@ module PulpNpmClient
     # 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, 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].hash
     end
 
     # Builds the object from hash

data/lib/pulp_npm_client/models/npm_npm_remote_response.rb

@@ -14,7 +14,7 @@ require 'date'
 require 'time'
 
 module PulpNpmClient
-  # A Serializer for NpmRemote.  Add any new fields if defined on NpmRemote. Similar to the example above, in PackageSerializer. Additional validators can be added to the parent validators list  For example::  class Meta:     validators = core_serializers.RemoteSerializer.Meta.validators + [myValidator1, ...]  By default the 'policy' field in core_serializers.RemoteSerializer only validates the choice 'immediate'. To add on-demand support for more 'policy' options, e.g. 'streamed' or 'on_demand', re-define the 'policy' option as follows::
+  # A Serializer for NpmRemote.  Add any new fields if defined on NpmRemote. Similar to the example above, in NpmPackageSerializer. Additional validators can be added to the parent validators list  For example::  class Meta:     validators = core_serializers.RemoteSerializer.Meta.validators + [myValidator1, ...]  By default the 'policy' field in core_serializers.RemoteSerializer only validates the choice 'immediate'. To add on-demand support for more 'policy' options, e.g. 'streamed' or 'on_demand', re-define the 'policy' option as follows::
   class NpmNpmRemoteResponse
     attr_accessor :pulp_href
 
@@ -33,6 +33,14 @@ module PulpNpmClient
     # The URL of an external content source.
     attr_accessor :url
 
+    attr_accessor :pulp_labels
+
+    # The policy to use when downloading content. The possible values include: 'immediate', 'on_demand', and 'streamed'. 'immediate' is the default.  * `immediate` - When syncing, download all metadata and content now. * `on_demand` - When syncing, download metadata, but do not download content now. Instead, download content as clients request it, and save it in Pulp to be served for future client requests. * `streamed` - When syncing, download metadata, but do not download content now. Instead,download content as clients request it, but never save it in Pulp. This causes future requests for that same content to have to be downloaded again.
+    attr_accessor :policy
+
+    # List of hidden (write only) fields
+    attr_accessor :hidden_fields
+
     # A PEM encoded CA certificate used to validate the server certificate presented by the remote server.
     attr_accessor :ca_cert
 
@@ -45,17 +53,9 @@ module PulpNpmClient
     # The proxy URL. Format: scheme://host:port
     attr_accessor :proxy_url
 
-    attr_accessor :pulp_labels
-
-    # Total number of simultaneous connections. If not set then the default value will be used.
-    attr_accessor :download_concurrency
-
     # Maximum number of retry attempts after a download failure. If not set then the default value (3) will be used.
     attr_accessor :max_retries
 
-    # The policy to use when downloading content. The possible values include: 'immediate', 'on_demand', and 'streamed'. 'immediate' is the default.  * `immediate` - When syncing, download all metadata and content now. * `on_demand` - When syncing, download metadata, but do not download content now. Instead, download content as clients request it, and save it in Pulp to be served for future client requests. * `streamed` - When syncing, download metadata, but do not download content now. Instead,download content as clients request it, but never save it in Pulp. This causes future requests for that same content to have to be downloaded again.
-    attr_accessor :policy
-
     # aiohttp.ClientTimeout.total (q.v.) for download-connections. The default is null, which will cause the default from the aiohttp library to be used.
     attr_accessor :total_timeout
 
@@ -71,12 +71,12 @@ module PulpNpmClient
     # Headers for aiohttp.Clientsession
     attr_accessor :headers
 
+    # Total number of simultaneous connections. If not set then the default value will be used.
+    attr_accessor :download_concurrency
+
     # Limits requests per second for each concurrent downloader
     attr_accessor :rate_limit
 
-    # List of hidden (write only) fields
-    attr_accessor :hidden_fields
-
     class EnumAttributeValidator
       attr_reader :datatype
       attr_reader :allowable_values
@@ -108,21 +108,21 @@ module PulpNpmClient
         :'pulp_last_updated' => :'pulp_last_updated',
         :'name' => :'name',
         :'url' => :'url',
+        :'pulp_labels' => :'pulp_labels',
+        :'policy' => :'policy',
+        :'hidden_fields' => :'hidden_fields',
         :'ca_cert' => :'ca_cert',
         :'client_cert' => :'client_cert',
         :'tls_validation' => :'tls_validation',
         :'proxy_url' => :'proxy_url',
-        :'pulp_labels' => :'pulp_labels',
-        :'download_concurrency' => :'download_concurrency',
         :'max_retries' => :'max_retries',
-        :'policy' => :'policy',
         :'total_timeout' => :'total_timeout',
         :'connect_timeout' => :'connect_timeout',
         :'sock_connect_timeout' => :'sock_connect_timeout',
         :'sock_read_timeout' => :'sock_read_timeout',
         :'headers' => :'headers',
-        :'rate_limit' => :'rate_limit',
-        :'hidden_fields' => :'hidden_fields'
+        :'download_concurrency' => :'download_concurrency',
+        :'rate_limit' => :'rate_limit'
       }
     end
 
@@ -140,21 +140,21 @@ module PulpNpmClient
         :'pulp_last_updated' => :'Time',
         :'name' => :'String',
         :'url' => :'String',
+        :'pulp_labels' => :'Hash<String, String>',
+        :'policy' => :'PolicyEnum',
+        :'hidden_fields' => :'Array<NpmNpmRemoteResponseHiddenFieldsInner>',
         :'ca_cert' => :'String',
         :'client_cert' => :'String',
         :'tls_validation' => :'Boolean',
         :'proxy_url' => :'String',
-        :'pulp_labels' => :'Hash<String, String>',
-        :'download_concurrency' => :'Integer',
         :'max_retries' => :'Integer',
-        :'policy' => :'PolicyEnum',
         :'total_timeout' => :'Float',
         :'connect_timeout' => :'Float',
         :'sock_connect_timeout' => :'Float',
         :'sock_read_timeout' => :'Float',
         :'headers' => :'Array<Object>',
-        :'rate_limit' => :'Integer',
-        :'hidden_fields' => :'Array<NpmNpmRemoteResponseHiddenFieldsInner>'
+        :'download_concurrency' => :'Integer',
+        :'rate_limit' => :'Integer'
       }
     end
 
@@ -164,13 +164,13 @@ module PulpNpmClient
         :'ca_cert',
         :'client_cert',
         :'proxy_url',
-        :'download_concurrency',
         :'max_retries',
         :'total_timeout',
         :'connect_timeout',
         :'sock_connect_timeout',
         :'sock_read_timeout',
-        :'rate_limit',
+        :'download_concurrency',
+        :'rate_limit'
       ])
     end
 
@@ -217,6 +217,22 @@ module PulpNpmClient
         self.url = nil
       end
 
+      if attributes.key?(:'pulp_labels')
+        if (value = attributes[:'pulp_labels']).is_a?(Hash)
+          self.pulp_labels = value
+        end
+      end
+
+      if attributes.key?(:'policy')
+        self.policy = attributes[:'policy']
+      end
+
+      if attributes.key?(:'hidden_fields')
+        if (value = attributes[:'hidden_fields']).is_a?(Array)
+          self.hidden_fields = value
+        end
+      end
+
       if attributes.key?(:'ca_cert')
         self.ca_cert = attributes[:'ca_cert']
       end
@@ -233,24 +249,10 @@ module PulpNpmClient
         self.proxy_url = attributes[:'proxy_url']
       end
 
-      if attributes.key?(:'pulp_labels')
-        if (value = attributes[:'pulp_labels']).is_a?(Hash)
-          self.pulp_labels = value
-        end
-      end
-
-      if attributes.key?(:'download_concurrency')
-        self.download_concurrency = attributes[:'download_concurrency']
-      end
-
       if attributes.key?(:'max_retries')
         self.max_retries = attributes[:'max_retries']
       end
 
-      if attributes.key?(:'policy')
-        self.policy = attributes[:'policy']
-      end
-
       if attributes.key?(:'total_timeout')
         self.total_timeout = attributes[:'total_timeout']
       end
@@ -273,14 +275,12 @@ module PulpNpmClient
         end
       end
 
-      if attributes.key?(:'rate_limit')
-        self.rate_limit = attributes[:'rate_limit']
+      if attributes.key?(:'download_concurrency')
+        self.download_concurrency = attributes[:'download_concurrency']
       end
 
-      if attributes.key?(:'hidden_fields')
-        if (value = attributes[:'hidden_fields']).is_a?(Array)
-          self.hidden_fields = value
-        end
+      if attributes.key?(:'rate_limit')
+        self.rate_limit = attributes[:'rate_limit']
       end
     end
 
@@ -380,21 +380,21 @@ module PulpNpmClient
           pulp_last_updated == o.pulp_last_updated &&
           name == o.name &&
           url == o.url &&
+          pulp_labels == o.pulp_labels &&
+          policy == o.policy &&
+          hidden_fields == o.hidden_fields &&
           ca_cert == o.ca_cert &&
           client_cert == o.client_cert &&
           tls_validation == o.tls_validation &&
           proxy_url == o.proxy_url &&
-          pulp_labels == o.pulp_labels &&
-          download_concurrency == o.download_concurrency &&
           max_retries == o.max_retries &&
-          policy == o.policy &&
           total_timeout == o.total_timeout &&
           connect_timeout == o.connect_timeout &&
           sock_connect_timeout == o.sock_connect_timeout &&
           sock_read_timeout == o.sock_read_timeout &&
           headers == o.headers &&
-          rate_limit == o.rate_limit &&
-          hidden_fields == o.hidden_fields
+          download_concurrency == o.download_concurrency &&
+          rate_limit == o.rate_limit
     end
 
     # @see the `==` method
@@ -406,7 +406,7 @@ module PulpNpmClient
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [pulp_href, prn, pulp_created, pulp_last_updated, name, url, ca_cert, client_cert, tls_validation, proxy_url, pulp_labels, download_concurrency, max_retries, policy, total_timeout, connect_timeout, sock_connect_timeout, sock_read_timeout, headers, rate_limit, hidden_fields].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].hash
     end
 
     # Builds the object from hash

data/lib/pulp_npm_client/models/npm_npm_repository.rb

@@ -14,7 +14,7 @@ require 'date'
 require 'time'
 
 module PulpNpmClient
-  # A Serializer for NpmRepository.  Add any new fields if defined on NpmRepository. Similar to the example above, in PackageSerializer. Additional validators can be added to the parent validators list  For example::  class Meta:     validators = core_serializers.RepositorySerializer.Meta.validators + [myValidator1, ...]
+  # A Serializer for NpmRepository.  Add any new fields if defined on NpmRepository. Similar to the example above, in NpmPackageSerializer. Additional validators can be added to the parent validators list  For example::  class Meta:     validators = core_serializers.RepositorySerializer.Meta.validators + [myValidator1, ...]
   class NpmNpmRepository
     attr_accessor :pulp_labels
 

data/lib/pulp_npm_client/models/npm_npm_repository_response.rb

@@ -14,7 +14,7 @@ require 'date'
 require 'time'
 
 module PulpNpmClient
-  # A Serializer for NpmRepository.  Add any new fields if defined on NpmRepository. Similar to the example above, in PackageSerializer. Additional validators can be added to the parent validators list  For example::  class Meta:     validators = core_serializers.RepositorySerializer.Meta.validators + [myValidator1, ...]
+  # A Serializer for NpmRepository.  Add any new fields if defined on NpmRepository. Similar to the example above, in NpmPackageSerializer. Additional validators can be added to the parent validators list  For example::  class Meta:     validators = core_serializers.RepositorySerializer.Meta.validators + [myValidator1, ...]
   class NpmNpmRepositoryResponse
     attr_accessor :pulp_href
 

data/lib/pulp_npm_client/models/npm_package_response.rb

@@ -14,7 +14,7 @@ require 'date'
 require 'time'
 
 module PulpNpmClient
-  # A Serializer for Package.  Add serializers for the new fields defined in Package and add those fields to the Meta class keeping fields from the parent class as well.  For example::  field1 = serializers.TextField() field2 = serializers.IntegerField() field3 = serializers.CharField()  class Meta:     fields = core_serializers.SingleArtifactContentSerializer.Meta.fields + (         'field1', 'field2', 'field3'     )     model = models.Package
+  # A Serializer for NpmPackage.
   class NpmPackageResponse
     attr_accessor :pulp_href
 
@@ -35,10 +35,13 @@ module PulpNpmClient
     # Artifact file representing the physical content
     attr_accessor :artifact
 
+    # Path where the artifact is located relative to distributions base_path. If not provided, it will be computed from name and version.
     attr_accessor :relative_path
 
+    # The name of the npm package.
     attr_accessor :name
 
+    # The version of the npm package.
     attr_accessor :version
 
     # Attribute mapping from ruby-style variable name to JSON key.
@@ -131,20 +134,14 @@ module PulpNpmClient
 
       if attributes.key?(:'relative_path')
         self.relative_path = attributes[:'relative_path']
-      else
-        self.relative_path = nil
       end
 
       if attributes.key?(:'name')
         self.name = attributes[:'name']
-      else
-        self.name = nil
       end
 
       if attributes.key?(:'version')
         self.version = attributes[:'version']
-      else
-        self.version = nil
       end
     end
 
@@ -153,18 +150,6 @@ module PulpNpmClient
     def list_invalid_properties
       warn '[DEPRECATED] the `list_invalid_properties` method is obsolete'
       invalid_properties = Array.new
-      if @relative_path.nil?
-        invalid_properties.push('invalid value for "relative_path", relative_path cannot be nil.')
-      end
-
-      if @name.nil?
-        invalid_properties.push('invalid value for "name", name cannot be nil.')
-      end
-
-      if @version.nil?
-        invalid_properties.push('invalid value for "version", version cannot be nil.')
-      end
-
       invalid_properties
     end
 
@@ -172,9 +157,6 @@ module PulpNpmClient
     # @return true if the model is valid
     def valid?
       warn '[DEPRECATED] the `valid?` method is obsolete'
-      return false if @relative_path.nil?
-      return false if @name.nil?
-      return false if @version.nil?
       true
     end