pulp_container_client 2.4.0.dev1614741644 → 2.4.0.dev1615346638

data/lib/pulp_container_client/models/container_container_remote.rb

@@ -33,9 +33,15 @@ module PulpContainerClient
     # If True, TLS peer validation must be performed.
     attr_accessor :tls_validation
 
-    # The proxy URL. Format: scheme://user:password@host:port
+    # The proxy URL. Format: scheme://host:port
     attr_accessor :proxy_url
 
+    # The username to authenticte to the proxy.
+    attr_accessor :proxy_username
+
+    # The password to authenticte to the proxy.
+    attr_accessor :proxy_password
+
     # The username to be used for authentication when syncing.
     attr_accessor :username
 
@@ -62,6 +68,9 @@ module PulpContainerClient
     # aiohttp.ClientTimeout.sock_read (q.v.) for download-connections.
     attr_accessor :sock_read_timeout
 
+    # Headers for aiohttp.Clientsession
+    attr_accessor :headers
+
     # Limits total download rate in requests per second
     attr_accessor :rate_limit
 
@@ -84,6 +93,8 @@ module PulpContainerClient
         :'client_key' => :'client_key',
         :'tls_validation' => :'tls_validation',
         :'proxy_url' => :'proxy_url',
+        :'proxy_username' => :'proxy_username',
+        :'proxy_password' => :'proxy_password',
         :'username' => :'username',
         :'password' => :'password',
         :'pulp_labels' => :'pulp_labels',
@@ -93,6 +104,7 @@ module PulpContainerClient
         :'connect_timeout' => :'connect_timeout',
         :'sock_connect_timeout' => :'sock_connect_timeout',
         :'sock_read_timeout' => :'sock_read_timeout',
+        :'headers' => :'headers',
         :'rate_limit' => :'rate_limit',
         :'upstream_name' => :'upstream_name',
         :'include_tags' => :'include_tags',
@@ -110,6 +122,8 @@ module PulpContainerClient
         :'client_key' => :'String',
         :'tls_validation' => :'Boolean',
         :'proxy_url' => :'String',
+        :'proxy_username' => :'String',
+        :'proxy_password' => :'String',
         :'username' => :'String',
         :'password' => :'String',
         :'pulp_labels' => :'Object',
@@ -119,6 +133,7 @@ module PulpContainerClient
         :'connect_timeout' => :'Float',
         :'sock_connect_timeout' => :'Float',
         :'sock_read_timeout' => :'Float',
+        :'headers' => :'Array<Object>',
         :'rate_limit' => :'Integer',
         :'upstream_name' => :'String',
         :'include_tags' => :'Array<String>',
@@ -133,6 +148,8 @@ module PulpContainerClient
         :'client_cert',
         :'client_key',
         :'proxy_url',
+        :'proxy_username',
+        :'proxy_password',
         :'username',
         :'password',
         :'total_timeout',
@@ -188,6 +205,14 @@ module PulpContainerClient
         self.proxy_url = attributes[:'proxy_url']
       end
 
+      if attributes.key?(:'proxy_username')
+        self.proxy_username = attributes[:'proxy_username']
+      end
+
+      if attributes.key?(:'proxy_password')
+        self.proxy_password = attributes[:'proxy_password']
+      end
+
       if attributes.key?(:'username')
         self.username = attributes[:'username']
       end
@@ -224,6 +249,12 @@ module PulpContainerClient
         self.sock_read_timeout = attributes[:'sock_read_timeout']
       end
 
+      if attributes.key?(:'headers')
+        if (value = attributes[:'headers']).is_a?(Array)
+          self.headers = value
+        end
+      end
+
       if attributes.key?(:'rate_limit')
         self.rate_limit = attributes[:'rate_limit']
       end
@@ -360,6 +391,8 @@ module PulpContainerClient
           client_key == o.client_key &&
           tls_validation == o.tls_validation &&
           proxy_url == o.proxy_url &&
+          proxy_username == o.proxy_username &&
+          proxy_password == o.proxy_password &&
           username == o.username &&
           password == o.password &&
           pulp_labels == o.pulp_labels &&
@@ -369,6 +402,7 @@ module PulpContainerClient
           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 &&
           upstream_name == o.upstream_name &&
           include_tags == o.include_tags &&
@@ -384,7 +418,7 @@ module PulpContainerClient
     # 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, username, password, pulp_labels, download_concurrency, policy, total_timeout, connect_timeout, sock_connect_timeout, sock_read_timeout, rate_limit, upstream_name, include_tags, exclude_tags].hash
+      [name, url, ca_cert, client_cert, client_key, tls_validation, proxy_url, proxy_username, proxy_password, username, password, pulp_labels, download_concurrency, policy, total_timeout, connect_timeout, sock_connect_timeout, sock_read_timeout, headers, rate_limit, upstream_name, include_tags, exclude_tags].hash
     end
 
     # Builds the object from hash

data/lib/pulp_container_client/models/container_container_remote_response.rb

@@ -32,21 +32,12 @@ module PulpContainerClient
     # A PEM encoded client certificate used for authentication.
     attr_accessor :client_cert
 
-    # A PEM encoded private key used for authentication.
-    attr_accessor :client_key
-
     # If True, TLS peer validation must be performed.
     attr_accessor :tls_validation
 
-    # The proxy URL. Format: scheme://user:password@host:port
+    # The proxy URL. Format: scheme://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
-
     attr_accessor :pulp_labels
 
     # Timestamp of the most recent update of the remote.
@@ -70,6 +61,9 @@ module PulpContainerClient
     # aiohttp.ClientTimeout.sock_read (q.v.) for download-connections.
     attr_accessor :sock_read_timeout
 
+    # Headers for aiohttp.Clientsession
+    attr_accessor :headers
+
     # Limits total download rate in requests per second
     attr_accessor :rate_limit
 
@@ -91,11 +85,8 @@ module PulpContainerClient
         :'url' => :'url',
         :'ca_cert' => :'ca_cert',
         :'client_cert' => :'client_cert',
-        :'client_key' => :'client_key',
         :'tls_validation' => :'tls_validation',
         :'proxy_url' => :'proxy_url',
-        :'username' => :'username',
-        :'password' => :'password',
         :'pulp_labels' => :'pulp_labels',
         :'pulp_last_updated' => :'pulp_last_updated',
         :'download_concurrency' => :'download_concurrency',
@@ -104,6 +95,7 @@ module PulpContainerClient
         :'connect_timeout' => :'connect_timeout',
         :'sock_connect_timeout' => :'sock_connect_timeout',
         :'sock_read_timeout' => :'sock_read_timeout',
+        :'headers' => :'headers',
         :'rate_limit' => :'rate_limit',
         :'upstream_name' => :'upstream_name',
         :'include_tags' => :'include_tags',
@@ -120,11 +112,8 @@ module PulpContainerClient
         :'url' => :'String',
         :'ca_cert' => :'String',
         :'client_cert' => :'String',
-        :'client_key' => :'String',
         :'tls_validation' => :'Boolean',
         :'proxy_url' => :'String',
-        :'username' => :'String',
-        :'password' => :'String',
         :'pulp_labels' => :'Object',
         :'pulp_last_updated' => :'DateTime',
         :'download_concurrency' => :'Integer',
@@ -133,6 +122,7 @@ module PulpContainerClient
         :'connect_timeout' => :'Float',
         :'sock_connect_timeout' => :'Float',
         :'sock_read_timeout' => :'Float',
+        :'headers' => :'Array<Object>',
         :'rate_limit' => :'Integer',
         :'upstream_name' => :'String',
         :'include_tags' => :'Array<String>',
@@ -145,10 +135,7 @@ module PulpContainerClient
       Set.new([
         :'ca_cert',
         :'client_cert',
-        :'client_key',
         :'proxy_url',
-        :'username',
-        :'password',
         :'total_timeout',
         :'connect_timeout',
         :'sock_connect_timeout',
@@ -198,10 +185,6 @@ module PulpContainerClient
         self.client_cert = attributes[:'client_cert']
       end
 
-      if attributes.key?(:'client_key')
-        self.client_key = attributes[:'client_key']
-      end
-
       if attributes.key?(:'tls_validation')
         self.tls_validation = attributes[:'tls_validation']
       end
@@ -210,14 +193,6 @@ module PulpContainerClient
         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?(:'pulp_labels')
         self.pulp_labels = attributes[:'pulp_labels']
       end
@@ -250,6 +225,12 @@ module PulpContainerClient
         self.sock_read_timeout = attributes[:'sock_read_timeout']
       end
 
+      if attributes.key?(:'headers')
+        if (value = attributes[:'headers']).is_a?(Array)
+          self.headers = value
+        end
+      end
+
       if attributes.key?(:'rate_limit')
         self.rate_limit = attributes[:'rate_limit']
       end
@@ -385,11 +366,8 @@ module PulpContainerClient
           url == o.url &&
           ca_cert == o.ca_cert &&
           client_cert == o.client_cert &&
-          client_key == o.client_key &&
           tls_validation == o.tls_validation &&
           proxy_url == o.proxy_url &&
-          username == o.username &&
-          password == o.password &&
           pulp_labels == o.pulp_labels &&
           pulp_last_updated == o.pulp_last_updated &&
           download_concurrency == o.download_concurrency &&
@@ -398,6 +376,7 @@ module PulpContainerClient
           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 &&
           upstream_name == o.upstream_name &&
           include_tags == o.include_tags &&
@@ -413,7 +392,7 @@ module PulpContainerClient
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [pulp_href, pulp_created, name, url, ca_cert, client_cert, client_key, tls_validation, proxy_url, username, password, pulp_labels, pulp_last_updated, download_concurrency, policy, total_timeout, connect_timeout, sock_connect_timeout, sock_read_timeout, rate_limit, upstream_name, include_tags, exclude_tags].hash
+      [pulp_href, pulp_created, name, url, ca_cert, client_cert, tls_validation, proxy_url, pulp_labels, pulp_last_updated, download_concurrency, policy, total_timeout, connect_timeout, sock_connect_timeout, sock_read_timeout, headers, rate_limit, upstream_name, include_tags, exclude_tags].hash
     end
 
     # Builds the object from hash

data/lib/pulp_container_client/models/patchedcontainer_container_distribution.rb

@@ -15,16 +15,16 @@ require 'date'
 module PulpContainerClient
   # A serializer for ContainerDistribution.
   class PatchedcontainerContainerDistribution
-    # 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
+    attr_accessor :pulp_labels
 
     # A unique name. Ex, `rawhide` and `stable`.
     attr_accessor :name
 
-    attr_accessor :pulp_labels
+    # RepositoryVersion to be served
+    attr_accessor :repository_version
+
+    # 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
 
     # The latest RepositoryVersion for this Repository will be served.
     attr_accessor :repository
@@ -41,10 +41,10 @@ module PulpContainerClient
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
-        :'base_path' => :'base_path',
-        :'repository_version' => :'repository_version',
-        :'name' => :'name',
         :'pulp_labels' => :'pulp_labels',
+        :'name' => :'name',
+        :'repository_version' => :'repository_version',
+        :'base_path' => :'base_path',
         :'repository' => :'repository',
         :'content_guard' => :'content_guard',
         :'private' => :'private',
@@ -55,10 +55,10 @@ module PulpContainerClient
     # Attribute type mapping.
     def self.openapi_types
       {
-        :'base_path' => :'String',
-        :'repository_version' => :'String',
-        :'name' => :'String',
         :'pulp_labels' => :'Object',
+        :'name' => :'String',
+        :'repository_version' => :'String',
+        :'base_path' => :'String',
         :'repository' => :'String',
         :'content_guard' => :'String',
         :'private' => :'Boolean',
@@ -90,20 +90,20 @@ module PulpContainerClient
         h[k.to_sym] = v
       }
 
-      if attributes.key?(:'base_path')
-        self.base_path = attributes[:'base_path']
-      end
-
-      if attributes.key?(:'repository_version')
-        self.repository_version = attributes[:'repository_version']
+      if attributes.key?(:'pulp_labels')
+        self.pulp_labels = attributes[:'pulp_labels']
       end
 
       if attributes.key?(:'name')
         self.name = attributes[:'name']
       end
 
-      if attributes.key?(:'pulp_labels')
-        self.pulp_labels = attributes[:'pulp_labels']
+      if attributes.key?(:'repository_version')
+        self.repository_version = attributes[:'repository_version']
+      end
+
+      if attributes.key?(:'base_path')
+        self.base_path = attributes[:'base_path']
       end
 
       if attributes.key?(:'repository')
@@ -141,10 +141,10 @@ module PulpContainerClient
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
-          base_path == o.base_path &&
-          repository_version == o.repository_version &&
-          name == o.name &&
           pulp_labels == o.pulp_labels &&
+          name == o.name &&
+          repository_version == o.repository_version &&
+          base_path == o.base_path &&
           repository == o.repository &&
           content_guard == o.content_guard &&
           private == o.private &&
@@ -160,7 +160,7 @@ module PulpContainerClient
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [base_path, repository_version, name, pulp_labels, repository, content_guard, private, description].hash
+      [pulp_labels, name, repository_version, base_path, repository, content_guard, private, description].hash
     end
 
     # Builds the object from hash

data/lib/pulp_container_client/models/patchedcontainer_container_remote.rb

@@ -33,9 +33,15 @@ module PulpContainerClient
     # If True, TLS peer validation must be performed.
     attr_accessor :tls_validation
 
-    # The proxy URL. Format: scheme://user:password@host:port
+    # The proxy URL. Format: scheme://host:port
     attr_accessor :proxy_url
 
+    # The username to authenticte to the proxy.
+    attr_accessor :proxy_username
+
+    # The password to authenticte to the proxy.
+    attr_accessor :proxy_password
+
     # The username to be used for authentication when syncing.
     attr_accessor :username
 
@@ -62,6 +68,9 @@ module PulpContainerClient
     # aiohttp.ClientTimeout.sock_read (q.v.) for download-connections.
     attr_accessor :sock_read_timeout
 
+    # Headers for aiohttp.Clientsession
+    attr_accessor :headers
+
     # Limits total download rate in requests per second
     attr_accessor :rate_limit
 
@@ -84,6 +93,8 @@ module PulpContainerClient
         :'client_key' => :'client_key',
         :'tls_validation' => :'tls_validation',
         :'proxy_url' => :'proxy_url',
+        :'proxy_username' => :'proxy_username',
+        :'proxy_password' => :'proxy_password',
         :'username' => :'username',
         :'password' => :'password',
         :'pulp_labels' => :'pulp_labels',
@@ -93,6 +104,7 @@ module PulpContainerClient
         :'connect_timeout' => :'connect_timeout',
         :'sock_connect_timeout' => :'sock_connect_timeout',
         :'sock_read_timeout' => :'sock_read_timeout',
+        :'headers' => :'headers',
         :'rate_limit' => :'rate_limit',
         :'upstream_name' => :'upstream_name',
         :'include_tags' => :'include_tags',
@@ -110,6 +122,8 @@ module PulpContainerClient
         :'client_key' => :'String',
         :'tls_validation' => :'Boolean',
         :'proxy_url' => :'String',
+        :'proxy_username' => :'String',
+        :'proxy_password' => :'String',
         :'username' => :'String',
         :'password' => :'String',
         :'pulp_labels' => :'Object',
@@ -119,6 +133,7 @@ module PulpContainerClient
         :'connect_timeout' => :'Float',
         :'sock_connect_timeout' => :'Float',
         :'sock_read_timeout' => :'Float',
+        :'headers' => :'Array<Object>',
         :'rate_limit' => :'Integer',
         :'upstream_name' => :'String',
         :'include_tags' => :'Array<String>',
@@ -133,6 +148,8 @@ module PulpContainerClient
         :'client_cert',
         :'client_key',
         :'proxy_url',
+        :'proxy_username',
+        :'proxy_password',
         :'username',
         :'password',
         :'total_timeout',
@@ -188,6 +205,14 @@ module PulpContainerClient
         self.proxy_url = attributes[:'proxy_url']
       end
 
+      if attributes.key?(:'proxy_username')
+        self.proxy_username = attributes[:'proxy_username']
+      end
+
+      if attributes.key?(:'proxy_password')
+        self.proxy_password = attributes[:'proxy_password']
+      end
+
       if attributes.key?(:'username')
         self.username = attributes[:'username']
       end
@@ -224,6 +249,12 @@ module PulpContainerClient
         self.sock_read_timeout = attributes[:'sock_read_timeout']
       end
 
+      if attributes.key?(:'headers')
+        if (value = attributes[:'headers']).is_a?(Array)
+          self.headers = value
+        end
+      end
+
       if attributes.key?(:'rate_limit')
         self.rate_limit = attributes[:'rate_limit']
       end
@@ -345,6 +376,8 @@ module PulpContainerClient
           client_key == o.client_key &&
           tls_validation == o.tls_validation &&
           proxy_url == o.proxy_url &&
+          proxy_username == o.proxy_username &&
+          proxy_password == o.proxy_password &&
           username == o.username &&
           password == o.password &&
           pulp_labels == o.pulp_labels &&
@@ -354,6 +387,7 @@ module PulpContainerClient
           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 &&
           upstream_name == o.upstream_name &&
           include_tags == o.include_tags &&
@@ -369,7 +403,7 @@ module PulpContainerClient
     # 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, username, password, pulp_labels, download_concurrency, policy, total_timeout, connect_timeout, sock_connect_timeout, sock_read_timeout, rate_limit, upstream_name, include_tags, exclude_tags].hash
+      [name, url, ca_cert, client_cert, client_key, tls_validation, proxy_url, proxy_username, proxy_password, username, password, pulp_labels, download_concurrency, policy, total_timeout, connect_timeout, sock_connect_timeout, sock_read_timeout, headers, rate_limit, upstream_name, include_tags, exclude_tags].hash
     end
 
     # Builds the object from hash