pulp_ansible_client 0.20.3 → 0.21.0

data/lib/pulp_ansible_client/models/ansible_collection_version.rb

@@ -15,16 +15,16 @@ require 'date'
 module PulpAnsibleClient
   # A serializer for CollectionVersion Content.
   class AnsibleCollectionVersion
-    # Artifact file representing the physical content
-    attr_accessor :artifact
-
-    # An uncommitted upload that may be turned into the artifact of the content unit.
+    # An uncommitted upload that may be turned into the content unit.
     attr_accessor :upload
 
     # A URI of a repository the new content unit should be associated with.
     attr_accessor :repository
 
-    # An uploaded file that may be turned into the artifact of the content unit.
+    # Artifact file representing the physical content
+    attr_accessor :artifact
+
+    # An uploaded file that may be turned into the content unit.
     attr_accessor :file
 
     # The name of the collection.
@@ -39,9 +39,9 @@ module PulpAnsibleClient
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
-        :'artifact' => :'artifact',
         :'upload' => :'upload',
         :'repository' => :'repository',
+        :'artifact' => :'artifact',
         :'file' => :'file',
         :'expected_name' => :'expected_name',
         :'expected_namespace' => :'expected_namespace',
@@ -52,9 +52,9 @@ module PulpAnsibleClient
     # Attribute type mapping.
     def self.openapi_types
       {
-        :'artifact' => :'String',
         :'upload' => :'String',
         :'repository' => :'String',
+        :'artifact' => :'String',
         :'file' => :'File',
         :'expected_name' => :'String',
         :'expected_namespace' => :'String',
@@ -83,10 +83,6 @@ module PulpAnsibleClient
         h[k.to_sym] = v
       }
 
-      if attributes.key?(:'artifact')
-        self.artifact = attributes[:'artifact']
-      end
-
       if attributes.key?(:'upload')
         self.upload = attributes[:'upload']
       end
@@ -95,6 +91,10 @@ module PulpAnsibleClient
         self.repository = attributes[:'repository']
       end
 
+      if attributes.key?(:'artifact')
+        self.artifact = attributes[:'artifact']
+      end
+
       if attributes.key?(:'file')
         self.file = attributes[:'file']
       end
@@ -202,9 +202,9 @@ module PulpAnsibleClient
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
-          artifact == o.artifact &&
           upload == o.upload &&
           repository == o.repository &&
+          artifact == o.artifact &&
           file == o.file &&
           expected_name == o.expected_name &&
           expected_namespace == o.expected_namespace &&
@@ -220,7 +220,7 @@ module PulpAnsibleClient
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [artifact, upload, repository, file, expected_name, expected_namespace, expected_version].hash
+      [upload, repository, artifact, file, expected_name, expected_namespace, expected_version].hash
     end
 
     # Builds the object from hash

data/lib/pulp_ansible_client/models/ansible_collection_version_response.rb

@@ -15,14 +15,14 @@ require 'date'
 module PulpAnsibleClient
   # A serializer for CollectionVersion Content.
   class AnsibleCollectionVersionResponse
+    attr_accessor :pulp_href
+
     # Timestamp of creation.
     attr_accessor :pulp_created
 
     # Artifact file representing the physical content
     attr_accessor :artifact
 
-    attr_accessor :pulp_href
-
     # The SHA-256 checksum if available.
     attr_accessor :sha256
 
@@ -97,9 +97,9 @@ module PulpAnsibleClient
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
+        :'pulp_href' => :'pulp_href',
         :'pulp_created' => :'pulp_created',
         :'artifact' => :'artifact',
-        :'pulp_href' => :'pulp_href',
         :'sha256' => :'sha256',
         :'md5' => :'md5',
         :'sha1' => :'sha1',
@@ -130,9 +130,9 @@ module PulpAnsibleClient
     # Attribute type mapping.
     def self.openapi_types
       {
+        :'pulp_href' => :'String',
         :'pulp_created' => :'DateTime',
         :'artifact' => :'String',
-        :'pulp_href' => :'String',
         :'sha256' => :'String',
         :'md5' => :'String',
         :'sha1' => :'String',
@@ -182,6 +182,10 @@ module PulpAnsibleClient
         h[k.to_sym] = v
       }
 
+      if attributes.key?(:'pulp_href')
+        self.pulp_href = attributes[:'pulp_href']
+      end
+
       if attributes.key?(:'pulp_created')
         self.pulp_created = attributes[:'pulp_created']
       end
@@ -190,10 +194,6 @@ module PulpAnsibleClient
         self.artifact = attributes[:'artifact']
       end
 
-      if attributes.key?(:'pulp_href')
-        self.pulp_href = attributes[:'pulp_href']
-      end
-
       if attributes.key?(:'sha256')
         self.sha256 = attributes[:'sha256']
       end
@@ -435,9 +435,9 @@ module PulpAnsibleClient
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
+          pulp_href == o.pulp_href &&
           pulp_created == o.pulp_created &&
           artifact == o.artifact &&
-          pulp_href == o.pulp_href &&
           sha256 == o.sha256 &&
           md5 == o.md5 &&
           sha1 == o.sha1 &&
@@ -473,7 +473,7 @@ module PulpAnsibleClient
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [pulp_created, artifact, pulp_href, sha256, md5, sha1, sha224, sha384, sha512, id, authors, contents, dependencies, description, docs_blob, manifest, files, documentation, homepage, issues, license, name, namespace, origin_repository, tags, version, requires_ansible].hash
+      [pulp_href, pulp_created, artifact, sha256, md5, sha1, sha224, sha384, sha512, id, authors, contents, dependencies, description, docs_blob, manifest, files, documentation, homepage, issues, license, name, namespace, origin_repository, tags, version, requires_ansible].hash
     end
 
     # Builds the object from hash

data/lib/pulp_ansible_client/models/ansible_collection_version_signature.rb

@@ -18,9 +18,12 @@ module PulpAnsibleClient
     # A URI of a repository the new content unit should be associated with.
     attr_accessor :repository
 
-    # An uploaded file that may be turned into the artifact of the content unit.
+    # An uploaded file that may be turned into the content unit.
     attr_accessor :file
 
+    # An uncommitted upload that may be turned into the content unit.
+    attr_accessor :upload
+
     # The content this signature is pointing to.
     attr_accessor :signed_collection
 
@@ -29,6 +32,7 @@ module PulpAnsibleClient
       {
         :'repository' => :'repository',
         :'file' => :'file',
+        :'upload' => :'upload',
         :'signed_collection' => :'signed_collection'
       }
     end
@@ -38,6 +42,7 @@ module PulpAnsibleClient
       {
         :'repository' => :'String',
         :'file' => :'File',
+        :'upload' => :'String',
         :'signed_collection' => :'String'
       }
     end
@@ -71,6 +76,10 @@ module PulpAnsibleClient
         self.file = attributes[:'file']
       end
 
+      if attributes.key?(:'upload')
+        self.upload = attributes[:'upload']
+      end
+
       if attributes.key?(:'signed_collection')
         self.signed_collection = attributes[:'signed_collection']
       end
@@ -80,10 +89,6 @@ module PulpAnsibleClient
     # @return Array for valid properties with the reasons
     def list_invalid_properties
       invalid_properties = Array.new
-      if @file.nil?
-        invalid_properties.push('invalid value for "file", file cannot be nil.')
-      end
-
       if @signed_collection.nil?
         invalid_properties.push('invalid value for "signed_collection", signed_collection cannot be nil.')
       end
@@ -94,7 +99,6 @@ module PulpAnsibleClient
     # 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 @file.nil?
       return false if @signed_collection.nil?
       true
     end
@@ -106,6 +110,7 @@ module PulpAnsibleClient
       self.class == o.class &&
           repository == o.repository &&
           file == o.file &&
+          upload == o.upload &&
           signed_collection == o.signed_collection
     end
 
@@ -118,7 +123,7 @@ module PulpAnsibleClient
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [repository, file, signed_collection].hash
+      [repository, file, upload, signed_collection].hash
     end
 
     # Builds the object from hash