pulp_ansible_client 0.7.1 → 0.7.2

data/lib/pulp_ansible_client/models/ansible_role_remote.rb

@@ -33,9 +33,15 @@ module PulpAnsibleClient
     # 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 PulpAnsibleClient
     # 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
 
@@ -75,6 +84,8 @@ module PulpAnsibleClient
         :'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',
@@ -84,6 +95,7 @@ module PulpAnsibleClient
         :'connect_timeout' => :'connect_timeout',
         :'sock_connect_timeout' => :'sock_connect_timeout',
         :'sock_read_timeout' => :'sock_read_timeout',
+        :'headers' => :'headers',
         :'rate_limit' => :'rate_limit'
       }
     end
@@ -98,6 +110,8 @@ module PulpAnsibleClient
         :'client_key' => :'String',
         :'tls_validation' => :'Boolean',
         :'proxy_url' => :'String',
+        :'proxy_username' => :'String',
+        :'proxy_password' => :'String',
         :'username' => :'String',
         :'password' => :'String',
         :'pulp_labels' => :'Object',
@@ -107,6 +121,7 @@ module PulpAnsibleClient
         :'connect_timeout' => :'Float',
         :'sock_connect_timeout' => :'Float',
         :'sock_read_timeout' => :'Float',
+        :'headers' => :'Array<Object>',
         :'rate_limit' => :'Integer'
       }
     end
@@ -118,6 +133,8 @@ module PulpAnsibleClient
         :'client_cert',
         :'client_key',
         :'proxy_url',
+        :'proxy_username',
+        :'proxy_password',
         :'username',
         :'password',
         :'total_timeout',
@@ -171,6 +188,14 @@ module PulpAnsibleClient
         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
@@ -207,6 +232,12 @@ module PulpAnsibleClient
         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
@@ -322,6 +353,8 @@ module PulpAnsibleClient
           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 &&
@@ -331,6 +364,7 @@ module PulpAnsibleClient
           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
     end
 
@@ -343,7 +377,7 @@ module PulpAnsibleClient
     # 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].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].hash
     end
 
     # Builds the object from hash

data/lib/pulp_ansible_client/models/ansible_role_remote_response.rb

@@ -32,21 +32,12 @@ module PulpAnsibleClient
     # 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 PulpAnsibleClient
     # 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
 
@@ -82,11 +76,8 @@ module PulpAnsibleClient
         :'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',
@@ -95,6 +86,7 @@ module PulpAnsibleClient
         :'connect_timeout' => :'connect_timeout',
         :'sock_connect_timeout' => :'sock_connect_timeout',
         :'sock_read_timeout' => :'sock_read_timeout',
+        :'headers' => :'headers',
         :'rate_limit' => :'rate_limit'
       }
     end
@@ -108,11 +100,8 @@ module PulpAnsibleClient
         :'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',
@@ -121,6 +110,7 @@ module PulpAnsibleClient
         :'connect_timeout' => :'Float',
         :'sock_connect_timeout' => :'Float',
         :'sock_read_timeout' => :'Float',
+        :'headers' => :'Array<Object>',
         :'rate_limit' => :'Integer'
       }
     end
@@ -130,10 +120,7 @@ module PulpAnsibleClient
       Set.new([
         :'ca_cert',
         :'client_cert',
-        :'client_key',
         :'proxy_url',
-        :'username',
-        :'password',
         :'total_timeout',
         :'connect_timeout',
         :'sock_connect_timeout',
@@ -181,10 +168,6 @@ module PulpAnsibleClient
         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
@@ -193,14 +176,6 @@ module PulpAnsibleClient
         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
@@ -233,6 +208,12 @@ module PulpAnsibleClient
         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
@@ -347,11 +328,8 @@ module PulpAnsibleClient
           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 &&
@@ -360,6 +338,7 @@ module PulpAnsibleClient
           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
     end
 
@@ -372,7 +351,7 @@ module PulpAnsibleClient
     # 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].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].hash
     end
 
     # Builds the object from hash

data/lib/pulp_ansible_client/models/ansible_role_response.rb

@@ -15,14 +15,14 @@ require 'date'
 module PulpAnsibleClient
   # A serializer for Role versions.
   class AnsibleRoleResponse
-    # Timestamp of creation.
-    attr_accessor :pulp_created
-
     attr_accessor :pulp_href
 
     # Artifact file representing the physical content
     attr_accessor :artifact
 
+    # Timestamp of creation.
+    attr_accessor :pulp_created
+
     attr_accessor :version
 
     attr_accessor :name
@@ -32,9 +32,9 @@ module PulpAnsibleClient
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
-        :'pulp_created' => :'pulp_created',
         :'pulp_href' => :'pulp_href',
         :'artifact' => :'artifact',
+        :'pulp_created' => :'pulp_created',
         :'version' => :'version',
         :'name' => :'name',
         :'namespace' => :'namespace'
@@ -44,9 +44,9 @@ module PulpAnsibleClient
     # Attribute type mapping.
     def self.openapi_types
       {
-        :'pulp_created' => :'DateTime',
         :'pulp_href' => :'String',
         :'artifact' => :'String',
+        :'pulp_created' => :'DateTime',
         :'version' => :'String',
         :'name' => :'String',
         :'namespace' => :'String'
@@ -74,10 +74,6 @@ module PulpAnsibleClient
         h[k.to_sym] = v
       }
 
-      if attributes.key?(:'pulp_created')
-        self.pulp_created = attributes[:'pulp_created']
-      end
-
       if attributes.key?(:'pulp_href')
         self.pulp_href = attributes[:'pulp_href']
       end
@@ -86,6 +82,10 @@ module PulpAnsibleClient
         self.artifact = attributes[:'artifact']
       end
 
+      if attributes.key?(:'pulp_created')
+        self.pulp_created = attributes[:'pulp_created']
+      end
+
       if attributes.key?(:'version')
         self.version = attributes[:'version']
       end
@@ -137,9 +137,9 @@ module PulpAnsibleClient
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
-          pulp_created == o.pulp_created &&
           pulp_href == o.pulp_href &&
           artifact == o.artifact &&
+          pulp_created == o.pulp_created &&
           version == o.version &&
           name == o.name &&
           namespace == o.namespace
@@ -154,7 +154,7 @@ module PulpAnsibleClient
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [pulp_created, pulp_href, artifact, version, name, namespace].hash
+      [pulp_href, artifact, pulp_created, version, name, namespace].hash
     end
 
     # Builds the object from hash

data/lib/pulp_ansible_client/models/content_summary.rb

@@ -33,9 +33,9 @@ module PulpAnsibleClient
     # Attribute type mapping.
     def self.openapi_types
       {
-        :'added' => :'Object',
-        :'removed' => :'Object',
-        :'present' => :'Object'
+        :'added' => :'Hash<String, Object>',
+        :'removed' => :'Hash<String, Object>',
+        :'present' => :'Hash<String, Object>'
       }
     end
 
@@ -61,15 +61,21 @@ module PulpAnsibleClient
       }
 
       if attributes.key?(:'added')
-        self.added = attributes[:'added']
+        if (value = attributes[:'added']).is_a?(Hash)
+          self.added = value
+        end
       end
 
       if attributes.key?(:'removed')
-        self.removed = attributes[:'removed']
+        if (value = attributes[:'removed']).is_a?(Hash)
+          self.removed = value
+        end
       end
 
       if attributes.key?(:'present')
-        self.present = attributes[:'present']
+        if (value = attributes[:'present']).is_a?(Hash)
+          self.present = value
+        end
       end
     end
 

data/lib/pulp_ansible_client/models/content_summary_response.rb

@@ -33,9 +33,9 @@ module PulpAnsibleClient
     # Attribute type mapping.
     def self.openapi_types
       {
-        :'added' => :'Object',
-        :'removed' => :'Object',
-        :'present' => :'Object'
+        :'added' => :'Hash<String, Object>',
+        :'removed' => :'Hash<String, Object>',
+        :'present' => :'Hash<String, Object>'
       }
     end
 
@@ -61,15 +61,21 @@ module PulpAnsibleClient
       }
 
       if attributes.key?(:'added')
-        self.added = attributes[:'added']
+        if (value = attributes[:'added']).is_a?(Hash)
+          self.added = value
+        end
       end
 
       if attributes.key?(:'removed')
-        self.removed = attributes[:'removed']
+        if (value = attributes[:'removed']).is_a?(Hash)
+          self.removed = value
+        end
       end
 
       if attributes.key?(:'present')
-        self.present = attributes[:'present']
+        if (value = attributes[:'present']).is_a?(Hash)
+          self.present = value
+        end
       end
     end
 

data/lib/pulp_ansible_client/models/patchedansible_collection_remote.rb

@@ -33,9 +33,15 @@ module PulpAnsibleClient
     # 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 PulpAnsibleClient
     # 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 PulpAnsibleClient
         :'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 PulpAnsibleClient
         :'connect_timeout' => :'connect_timeout',
         :'sock_connect_timeout' => :'sock_connect_timeout',
         :'sock_read_timeout' => :'sock_read_timeout',
+        :'headers' => :'headers',
         :'rate_limit' => :'rate_limit',
         :'requirements_file' => :'requirements_file',
         :'auth_url' => :'auth_url',
@@ -110,6 +122,8 @@ module PulpAnsibleClient
         :'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 PulpAnsibleClient
         :'connect_timeout' => :'Float',
         :'sock_connect_timeout' => :'Float',
         :'sock_read_timeout' => :'Float',
+        :'headers' => :'Array<Object>',
         :'rate_limit' => :'Integer',
         :'requirements_file' => :'String',
         :'auth_url' => :'String',
@@ -133,6 +148,8 @@ module PulpAnsibleClient
         :'client_cert',
         :'client_key',
         :'proxy_url',
+        :'proxy_username',
+        :'proxy_password',
         :'username',
         :'password',
         :'total_timeout',
@@ -189,6 +206,14 @@ module PulpAnsibleClient
         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
@@ -225,6 +250,12 @@ module PulpAnsibleClient
         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
@@ -372,6 +403,8 @@ module PulpAnsibleClient
           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 &&
@@ -381,6 +414,7 @@ module PulpAnsibleClient
           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 &&
           requirements_file == o.requirements_file &&
           auth_url == o.auth_url &&
@@ -396,7 +430,7 @@ module PulpAnsibleClient
     # 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, requirements_file, auth_url, token].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, requirements_file, auth_url, token].hash
     end
 
     # Builds the object from hash