pulp_npm_client 0.5.0 → 0.6.0

data/lib/pulp_npm_client/models/patchednpm_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 PatchednpmNpmRemote
     # 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
@@ -203,6 +203,16 @@ module PulpNpmClient
         self.url = attributes[:'url']
       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
@@ -239,24 +249,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
@@ -279,6 +275,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
@@ -524,6 +524,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 &&
@@ -533,15 +535,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
 
@@ -554,7 +554,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/patchednpm_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 PatchednpmNpmRepository
     attr_accessor :pulp_labels