emass_client 1.0.3 → 1.0.5

data/lib/emass_client/models/pac_response_post.rb

@@ -1,15 +1,17 @@
 =begin
 #Enterprise Mission Assurance Support Service (eMASS)
 
-#The Enterprise Mission Assurance Support Service (eMASS) Representational State Transfer (REST) Application Programming Interface (API) enables users to perform assessments and complete actions associated with system records.   The `emasser` is a command-line interface (CLI) tool that implements all of the  eMASS endpoints defined in the eMASS REST API v3.2, dated October 21, 2021.</br><br>  <strong>Register CLI</strong></br> New users will need to register an API key with the eMASS development team prior to accessing the site for the first time. The eMASS REST API requires a client certificate (SSL/TLS, DoD PKI only) where {url}/api/register (POST) is used to register the client certificate.</br></br>  Every call to the eMASS REST API will require the use of the agreed upon public key certificate and API key. The API key must be provided in the request header for all endpoint calls (api-key). If the service receives an untrusted certificate or API key, a 401 error response code will be returned along with an error message.</br></br>  <strong>Available Request Headers:</strong></br> <table>   <tr>     <th align=left>key</th>     <th align=left>Example Value</th>     <th align=left>Description</th>   </tr>   <tr>     <td>`api-key`</td>     <td>api-key-provided-by-emass</td>     <td>This API key must be provided in the request header for all endpoint calls</td>   </tr>   <tr>     <td>`user-uid`</td>     <td>USER.UID.KEY</td>     <td>This User unique identifier key must be provided in the request header for all PUT, POST, and DELETE endpoint calls</td>   </tr>   <tr>     <td></td><td></td>     <td>       Note: For DoD users this is the DoD ID Number (EIDIPI) on their DoD CAC     </td>   </tr> </table>  </br><strong>Approve API Client for Actionable Requests</strong></br> Users are required to log-in to eMASS and grant permissions for a client to update data within eMASS on their behalf. This is only required for actionable requests (PUT, POST, DELETE). The Registration Endpoint and all GET requests can be accessed without completing this process with the correct permissions. Please note that leaving a field parameter blank (for PUT/POST requests) has the potential to clear information in the active eMASS records.  To establish an account with eMASS and/or acquire an api-key/user-uid, contact one of the listed POC: 
+#The Enterprise Mission Assurance Support Service (eMASS) Representational State Transfer (REST) Application Programming Interface (API) enables users to perform assessments and complete actions associated with system records.   <strong>Register External Application (that use the eMASS API)</strong></br> New users will need to [register](https://nisp.emass.apps.mil/Content/Help/jobaids/eMASS_OT_NewUser_Job_Aid.pdf) an API key with the eMASS development team prior to accessing the site for the first time. The eMASS REST API  requires a client certificate (SSL/TLS, DoD PKI only). Use the `Registration` endpoint to register the client certificate.</br></br>  Every call to the eMASS REST API will require the use of the agreed upon public key certificate and API key.  The API key must be provided in the request header for all endpoint calls (api-key). If the service receives an untrusted certificate or API key, a 401 error response code will be returned along with an error message.</br></br>  <strong>Available Request Headers</strong></br> <table>   <tr>     <th align=left>key</th>     <th align=left>Example Value</th>     <th align=left>Description</th>   </tr>   <tr>     <td>`api-key`</td>     <td>api-key-provided-by-emass</td>     <td>This API key must be provided in the request header for all endpoint calls</td>   </tr>   <tr>     <td>`user-uid`</td>     <td>USER.UID.KEY</td>     <td>This User unique identifier key must be provided in the request header for all PUT, POST, and DELETE endpoint calls</td>   </tr>   <tr>     <td></td><td></td>     <td>       Note: For DoD users this is the DoD ID Number (EIDIPI) on their DoD CAC     </td>   </tr> </table>  </br><strong>Approve API Client for Actionable Requests</strong></br> Users are required to log-in to eMASS and grant permissions for a client to update data within eMASS on their behalf. This is only required for actionable requests (PUT, POST, DELETE). The Registration Endpoint and all GET requests can be accessed without completing this process with the correct permissions. Please note that leaving a field parameter blank (for PUT/POST requests) has the potential to clear information in the active eMASS records.  To establish an account with eMASS and/or acquire an api-key/user-uid, contact one of the listed POC: 
 
-OpenAPI spec version: v3.2
+The version of the OpenAPI document: v3.3
 Contact: disa.meade.id.mbx.emass-tier-iii-support@mail.mil
-Generated by: https://github.com/swagger-api/swagger-codegen.git
-Swagger Codegen version: 3.0.26
+Generated by: https://openapi-generator.tech
+OpenAPI Generator version: 6.0.0-SNAPSHOT
+
 =end
 
 require 'date'
+require 'time'
 
 module EmassClient
   class PacResponsePost
@@ -25,11 +27,16 @@ module EmassClient
       }
     end
 
+    # Returns all the JSON keys this model knows about
+    def self.acceptable_attributes
+      attribute_map.values
+    end
+
     # Attribute type mapping.
     def self.openapi_types
       {
-        :'meta' => :'Object',
-        :'data' => :'Object'
+        :'meta' => :'Response200',
+        :'data' => :'Array<PacPost>'
       }
     end
 
@@ -38,7 +45,7 @@ module EmassClient
       Set.new([
       ])
     end
-  
+
     # Initializes the object
     # @param [Hash] attributes Model attributes in the form of hash
     def initialize(attributes = {})
@@ -111,8 +118,11 @@ module EmassClient
     # @return [Object] Returns the model itself
     def build_from_hash(attributes)
       return nil unless attributes.is_a?(Hash)
+      attributes = attributes.transform_keys(&:to_sym)
       self.class.openapi_types.each_pair do |key, type|
-        if type =~ /\AArray<(.*)>/i
+        if attributes[self.class.attribute_map[key]].nil? && self.class.openapi_nullable.include?(key)
+          self.send("#{key}=", nil)
+        elsif type =~ /\AArray<(.*)>/i
           # check to ensure the input is an array given that the attribute
           # is documented as an array but the input is not
           if attributes[self.class.attribute_map[key]].is_a?(Array)
@@ -120,8 +130,6 @@ module EmassClient
           end
         elsif !attributes[self.class.attribute_map[key]].nil?
           self.send("#{key}=", _deserialize(type, attributes[self.class.attribute_map[key]]))
-        elsif attributes[self.class.attribute_map[key]].nil? && self.class.openapi_nullable.include?(key)
-          self.send("#{key}=", nil)
         end
       end
 
@@ -134,8 +142,8 @@ module EmassClient
     # @return [Object] Deserialized data
     def _deserialize(type, value)
       case type.to_sym
-      when :DateTime
-        DateTime.parse(value)
+      when :Time
+        Time.parse(value)
       when :Date
         Date.parse(value)
       when :String
@@ -165,7 +173,9 @@ module EmassClient
           end
         end
       else # model
-        EmassClient.const_get(type).build_from_hash(value)
+        # models (e.g. Pet) or oneOf
+        klass = EmassClient.const_get(type)
+        klass.respond_to?(:openapi_one_of) ? klass.build(value) : klass.build_from_hash(value)
       end
     end
 
@@ -213,5 +223,8 @@ module EmassClient
       else
         value
       end
-    end  end
+    end
+
+  end
+
 end

data/lib/emass_client/models/poam_get.rb

@@ -1,18 +1,23 @@
 =begin
 #Enterprise Mission Assurance Support Service (eMASS)
 
-#The Enterprise Mission Assurance Support Service (eMASS) Representational State Transfer (REST) Application Programming Interface (API) enables users to perform assessments and complete actions associated with system records.   The `emasser` is a command-line interface (CLI) tool that implements all of the  eMASS endpoints defined in the eMASS REST API v3.2, dated October 21, 2021.</br><br>  <strong>Register CLI</strong></br> New users will need to register an API key with the eMASS development team prior to accessing the site for the first time. The eMASS REST API requires a client certificate (SSL/TLS, DoD PKI only) where {url}/api/register (POST) is used to register the client certificate.</br></br>  Every call to the eMASS REST API will require the use of the agreed upon public key certificate and API key. The API key must be provided in the request header for all endpoint calls (api-key). If the service receives an untrusted certificate or API key, a 401 error response code will be returned along with an error message.</br></br>  <strong>Available Request Headers:</strong></br> <table>   <tr>     <th align=left>key</th>     <th align=left>Example Value</th>     <th align=left>Description</th>   </tr>   <tr>     <td>`api-key`</td>     <td>api-key-provided-by-emass</td>     <td>This API key must be provided in the request header for all endpoint calls</td>   </tr>   <tr>     <td>`user-uid`</td>     <td>USER.UID.KEY</td>     <td>This User unique identifier key must be provided in the request header for all PUT, POST, and DELETE endpoint calls</td>   </tr>   <tr>     <td></td><td></td>     <td>       Note: For DoD users this is the DoD ID Number (EIDIPI) on their DoD CAC     </td>   </tr> </table>  </br><strong>Approve API Client for Actionable Requests</strong></br> Users are required to log-in to eMASS and grant permissions for a client to update data within eMASS on their behalf. This is only required for actionable requests (PUT, POST, DELETE). The Registration Endpoint and all GET requests can be accessed without completing this process with the correct permissions. Please note that leaving a field parameter blank (for PUT/POST requests) has the potential to clear information in the active eMASS records.  To establish an account with eMASS and/or acquire an api-key/user-uid, contact one of the listed POC: 
+#The Enterprise Mission Assurance Support Service (eMASS) Representational State Transfer (REST) Application Programming Interface (API) enables users to perform assessments and complete actions associated with system records.   <strong>Register External Application (that use the eMASS API)</strong></br> New users will need to [register](https://nisp.emass.apps.mil/Content/Help/jobaids/eMASS_OT_NewUser_Job_Aid.pdf) an API key with the eMASS development team prior to accessing the site for the first time. The eMASS REST API  requires a client certificate (SSL/TLS, DoD PKI only). Use the `Registration` endpoint to register the client certificate.</br></br>  Every call to the eMASS REST API will require the use of the agreed upon public key certificate and API key.  The API key must be provided in the request header for all endpoint calls (api-key). If the service receives an untrusted certificate or API key, a 401 error response code will be returned along with an error message.</br></br>  <strong>Available Request Headers</strong></br> <table>   <tr>     <th align=left>key</th>     <th align=left>Example Value</th>     <th align=left>Description</th>   </tr>   <tr>     <td>`api-key`</td>     <td>api-key-provided-by-emass</td>     <td>This API key must be provided in the request header for all endpoint calls</td>   </tr>   <tr>     <td>`user-uid`</td>     <td>USER.UID.KEY</td>     <td>This User unique identifier key must be provided in the request header for all PUT, POST, and DELETE endpoint calls</td>   </tr>   <tr>     <td></td><td></td>     <td>       Note: For DoD users this is the DoD ID Number (EIDIPI) on their DoD CAC     </td>   </tr> </table>  </br><strong>Approve API Client for Actionable Requests</strong></br> Users are required to log-in to eMASS and grant permissions for a client to update data within eMASS on their behalf. This is only required for actionable requests (PUT, POST, DELETE). The Registration Endpoint and all GET requests can be accessed without completing this process with the correct permissions. Please note that leaving a field parameter blank (for PUT/POST requests) has the potential to clear information in the active eMASS records.  To establish an account with eMASS and/or acquire an api-key/user-uid, contact one of the listed POC: 
 
-OpenAPI spec version: v3.2
+The version of the OpenAPI document: v3.3
 Contact: disa.meade.id.mbx.emass-tier-iii-support@mail.mil
-Generated by: https://github.com/swagger-api/swagger-codegen.git
-Swagger Codegen version: 3.0.26
+Generated by: https://openapi-generator.tech
+OpenAPI Generator version: 6.0.0-SNAPSHOT
+
 =end
 
 require 'date'
+require 'time'
 
 module EmassClient
   class PoamGet
+    # [Optional] Unique identifier external to the eMASS application for use with associating POA&Ms. 100 Characters.
+    attr_accessor :external_uid
+
     # [Required] Unique eMASS system identifier.
     attr_accessor :system_id
 
@@ -25,11 +30,8 @@ module EmassClient
     # [Read-only] Indicates whether a test result is inherited.
     attr_accessor :is_inherited
 
-    # [Optional] Unique identifier external to the eMASS application for use with associating POA&Ms. 100 Characters.
-    attr_accessor :external_uid
-
     # [Optional] System acronym name.
-    attr_accessor :control_acronyms
+    attr_accessor :control_acronym
 
     # [Optional] CCI associated with POA&M Item..
     attr_accessor :cci
@@ -63,7 +65,7 @@ module EmassClient
     # [Conditional] Email address of POC. 100 Characters.
     attr_accessor :poc_email
 
-    # [Conditional] Phone number of POC (area code) ***-**** format. 100 Characters.
+    # [Conditional] Phone number of POC. 100 Characters.
     attr_accessor :poc_phone_number
 
     # [Conditional] Required for approved items. Values include the following options (Very Low,Low,Moderate,High,Very High)
@@ -136,12 +138,12 @@ module EmassClient
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
+        :'external_uid' => :'externalUid',
         :'system_id' => :'systemId',
         :'poam_id' => :'poamId',
         :'display_poam_id' => :'displayPoamId',
         :'is_inherited' => :'isInherited',
-        :'external_uid' => :'externalUid',
-        :'control_acronyms' => :'controlAcronyms',
+        :'control_acronym' => :'controlAcronym',
         :'cci' => :'cci',
         :'status' => :'status',
         :'review_status' => :'reviewStatus',
@@ -172,51 +174,80 @@ module EmassClient
       }
     end
 
+    # Returns all the JSON keys this model knows about
+    def self.acceptable_attributes
+      attribute_map.values
+    end
+
     # Attribute type mapping.
     def self.openapi_types
       {
-        :'system_id' => :'Object',
-        :'poam_id' => :'Object',
-        :'display_poam_id' => :'Object',
-        :'is_inherited' => :'Object',
-        :'external_uid' => :'Object',
-        :'control_acronyms' => :'Object',
-        :'cci' => :'Object',
-        :'status' => :'Object',
-        :'review_status' => :'Object',
-        :'vulnerability_description' => :'Object',
-        :'source_ident_vuln' => :'Object',
-        :'security_checks' => :'Object',
-        :'milestones' => :'Object',
-        :'poc_organization' => :'Object',
-        :'poc_first_name' => :'Object',
-        :'poc_last_name' => :'Object',
-        :'poc_email' => :'Object',
-        :'poc_phone_number' => :'Object',
-        :'severity' => :'Object',
-        :'raw_severity' => :'Object',
-        :'relevance_of_threat' => :'Object',
-        :'likelihood' => :'Object',
-        :'impact' => :'Object',
-        :'impact_description' => :'Object',
-        :'residual_risk_level' => :'Object',
-        :'recommendations' => :'Object',
-        :'resources' => :'Object',
-        :'scheduled_completion_date' => :'Object',
-        :'completion_date' => :'Object',
-        :'extension_date' => :'Object',
-        :'comments' => :'Object',
-        :'mitigation' => :'Object',
-        :'is_active' => :'Object'
+        :'external_uid' => :'String',
+        :'system_id' => :'Integer',
+        :'poam_id' => :'Integer',
+        :'display_poam_id' => :'Integer',
+        :'is_inherited' => :'Boolean',
+        :'control_acronym' => :'String',
+        :'cci' => :'String',
+        :'status' => :'String',
+        :'review_status' => :'String',
+        :'vulnerability_description' => :'String',
+        :'source_ident_vuln' => :'String',
+        :'security_checks' => :'String',
+        :'milestones' => :'Array<MilestonesGet>',
+        :'poc_organization' => :'String',
+        :'poc_first_name' => :'String',
+        :'poc_last_name' => :'String',
+        :'poc_email' => :'String',
+        :'poc_phone_number' => :'String',
+        :'severity' => :'String',
+        :'raw_severity' => :'String',
+        :'relevance_of_threat' => :'String',
+        :'likelihood' => :'String',
+        :'impact' => :'String',
+        :'impact_description' => :'String',
+        :'residual_risk_level' => :'String',
+        :'recommendations' => :'String',
+        :'resources' => :'String',
+        :'scheduled_completion_date' => :'Integer',
+        :'completion_date' => :'Integer',
+        :'extension_date' => :'Integer',
+        :'comments' => :'String',
+        :'mitigation' => :'String',
+        :'is_active' => :'Boolean'
       }
     end
 
     # List of attributes with nullable: true
     def self.openapi_nullable
       Set.new([
+        :'external_uid',
+        :'is_inherited',
+        :'control_acronym',
+        :'cci',
+        :'review_status',
+        :'security_checks',
+        :'poc_first_name',
+        :'poc_last_name',
+        :'poc_email',
+        :'poc_phone_number',
+        :'severity',
+        :'raw_severity',
+        :'relevance_of_threat',
+        :'likelihood',
+        :'impact',
+        :'impact_description',
+        :'residual_risk_level',
+        :'recommendations',
+        :'scheduled_completion_date',
+        :'completion_date',
+        :'extension_date',
+        :'comments',
+        :'mitigation',
+        :'is_active'
       ])
     end
-  
+
     # Initializes the object
     # @param [Hash] attributes Model attributes in the form of hash
     def initialize(attributes = {})
@@ -232,6 +263,10 @@ module EmassClient
         h[k.to_sym] = v
       }
 
+      if attributes.key?(:'external_uid')
+        self.external_uid = attributes[:'external_uid']
+      end
+
       if attributes.key?(:'system_id')
         self.system_id = attributes[:'system_id']
       end
@@ -248,12 +283,8 @@ module EmassClient
         self.is_inherited = attributes[:'is_inherited']
       end
 
-      if attributes.key?(:'external_uid')
-        self.external_uid = attributes[:'external_uid']
-      end
-
-      if attributes.key?(:'control_acronyms')
-        self.control_acronyms = attributes[:'control_acronyms']
+      if attributes.key?(:'control_acronym')
+        self.control_acronym = attributes[:'control_acronym']
       end
 
       if attributes.key?(:'cci')
@@ -377,21 +408,21 @@ module EmassClient
     # Check to see if the all the properties in the model are valid
     # @return true if the model is valid
     def valid?
-      status_validator = EnumAttributeValidator.new('Object', ['Ongoing', 'Risk Accepted', 'Completed', 'Not Applicable'])
+      status_validator = EnumAttributeValidator.new('String', ["Ongoing", "Risk Accepted", "Completed", "Not Applicable", "Archived", "unknown_default_open_api"])
       return false unless status_validator.valid?(@status)
-      review_status_validator = EnumAttributeValidator.new('Object', ['Not Approved', 'Under Review', 'Approved'])
+      review_status_validator = EnumAttributeValidator.new('String', ["Not Approved", "Under Review", "Approved", "unknown_default_open_api"])
       return false unless review_status_validator.valid?(@review_status)
-      severity_validator = EnumAttributeValidator.new('Object', ['Very Low', 'Low', 'Moderate', 'High', 'Very High'])
+      severity_validator = EnumAttributeValidator.new('String', ["Very Low", "Low", "Moderate", "High", "Very High", "unknown_default_open_api"])
       return false unless severity_validator.valid?(@severity)
-      raw_severity_validator = EnumAttributeValidator.new('Object', ['I', 'II', 'III'])
+      raw_severity_validator = EnumAttributeValidator.new('String', ["I", "II", "III", "unknown_default_open_api"])
       return false unless raw_severity_validator.valid?(@raw_severity)
-      relevance_of_threat_validator = EnumAttributeValidator.new('Object', ['Very Low', 'Low', 'Moderate', 'High', 'Very High'])
+      relevance_of_threat_validator = EnumAttributeValidator.new('String', ["Very Low", "Low", "Moderate", "High", "Very High", "unknown_default_open_api"])
       return false unless relevance_of_threat_validator.valid?(@relevance_of_threat)
-      likelihood_validator = EnumAttributeValidator.new('Object', ['Very Low', 'Low', 'Moderate', 'High', 'Very High'])
+      likelihood_validator = EnumAttributeValidator.new('String', ["Very Low", "Low", "Moderate", "High", "Very High", "unknown_default_open_api"])
       return false unless likelihood_validator.valid?(@likelihood)
-      impact_validator = EnumAttributeValidator.new('Object', ['Very Low', 'Low', 'Moderate', 'High', 'Very High'])
+      impact_validator = EnumAttributeValidator.new('String', ["Very Low", "Low", "Moderate", "High", "Very High", "unknown_default_open_api"])
       return false unless impact_validator.valid?(@impact)
-      residual_risk_level_validator = EnumAttributeValidator.new('Object', ['Very Low', 'Low', 'Moderate', 'High', 'Very High'])
+      residual_risk_level_validator = EnumAttributeValidator.new('String', ["Very Low", "Low", "Moderate", "High", "Very High", "unknown_default_open_api"])
       return false unless residual_risk_level_validator.valid?(@residual_risk_level)
       true
     end
@@ -399,7 +430,7 @@ module EmassClient
     # Custom attribute writer method checking allowed values (enum).
     # @param [Object] status Object to be assigned
     def status=(status)
-      validator = EnumAttributeValidator.new('Object', ['Ongoing', 'Risk Accepted', 'Completed', 'Not Applicable'])
+      validator = EnumAttributeValidator.new('String', ["Ongoing", "Risk Accepted", "Completed", "Not Applicable", "Archived", "unknown_default_open_api"])
       unless validator.valid?(status)
         fail ArgumentError, "invalid value for \"status\", must be one of #{validator.allowable_values}."
       end
@@ -409,7 +440,7 @@ module EmassClient
     # Custom attribute writer method checking allowed values (enum).
     # @param [Object] review_status Object to be assigned
     def review_status=(review_status)
-      validator = EnumAttributeValidator.new('Object', ['Not Approved', 'Under Review', 'Approved'])
+      validator = EnumAttributeValidator.new('String', ["Not Approved", "Under Review", "Approved", "unknown_default_open_api"])
       unless validator.valid?(review_status)
         fail ArgumentError, "invalid value for \"review_status\", must be one of #{validator.allowable_values}."
       end
@@ -419,7 +450,7 @@ module EmassClient
     # Custom attribute writer method checking allowed values (enum).
     # @param [Object] severity Object to be assigned
     def severity=(severity)
-      validator = EnumAttributeValidator.new('Object', ['Very Low', 'Low', 'Moderate', 'High', 'Very High'])
+      validator = EnumAttributeValidator.new('String', ["Very Low", "Low", "Moderate", "High", "Very High", "unknown_default_open_api"])
       unless validator.valid?(severity)
         fail ArgumentError, "invalid value for \"severity\", must be one of #{validator.allowable_values}."
       end
@@ -429,7 +460,7 @@ module EmassClient
     # Custom attribute writer method checking allowed values (enum).
     # @param [Object] raw_severity Object to be assigned
     def raw_severity=(raw_severity)
-      validator = EnumAttributeValidator.new('Object', ['I', 'II', 'III'])
+      validator = EnumAttributeValidator.new('String', ["I", "II", "III", "unknown_default_open_api"])
       unless validator.valid?(raw_severity)
         fail ArgumentError, "invalid value for \"raw_severity\", must be one of #{validator.allowable_values}."
       end
@@ -439,7 +470,7 @@ module EmassClient
     # Custom attribute writer method checking allowed values (enum).
     # @param [Object] relevance_of_threat Object to be assigned
     def relevance_of_threat=(relevance_of_threat)
-      validator = EnumAttributeValidator.new('Object', ['Very Low', 'Low', 'Moderate', 'High', 'Very High'])
+      validator = EnumAttributeValidator.new('String', ["Very Low", "Low", "Moderate", "High", "Very High", "unknown_default_open_api"])
       unless validator.valid?(relevance_of_threat)
         fail ArgumentError, "invalid value for \"relevance_of_threat\", must be one of #{validator.allowable_values}."
       end
@@ -449,7 +480,7 @@ module EmassClient
     # Custom attribute writer method checking allowed values (enum).
     # @param [Object] likelihood Object to be assigned
     def likelihood=(likelihood)
-      validator = EnumAttributeValidator.new('Object', ['Very Low', 'Low', 'Moderate', 'High', 'Very High'])
+      validator = EnumAttributeValidator.new('String', ["Very Low", "Low", "Moderate", "High", "Very High", "unknown_default_open_api"])
       unless validator.valid?(likelihood)
         fail ArgumentError, "invalid value for \"likelihood\", must be one of #{validator.allowable_values}."
       end
@@ -459,7 +490,7 @@ module EmassClient
     # Custom attribute writer method checking allowed values (enum).
     # @param [Object] impact Object to be assigned
     def impact=(impact)
-      validator = EnumAttributeValidator.new('Object', ['Very Low', 'Low', 'Moderate', 'High', 'Very High'])
+      validator = EnumAttributeValidator.new('String', ["Very Low", "Low", "Moderate", "High", "Very High", "unknown_default_open_api"])
       unless validator.valid?(impact)
         fail ArgumentError, "invalid value for \"impact\", must be one of #{validator.allowable_values}."
       end
@@ -469,7 +500,7 @@ module EmassClient
     # Custom attribute writer method checking allowed values (enum).
     # @param [Object] residual_risk_level Object to be assigned
     def residual_risk_level=(residual_risk_level)
-      validator = EnumAttributeValidator.new('Object', ['Very Low', 'Low', 'Moderate', 'High', 'Very High'])
+      validator = EnumAttributeValidator.new('String', ["Very Low", "Low", "Moderate", "High", "Very High", "unknown_default_open_api"])
       unless validator.valid?(residual_risk_level)
         fail ArgumentError, "invalid value for \"residual_risk_level\", must be one of #{validator.allowable_values}."
       end
@@ -481,12 +512,12 @@ module EmassClient
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
+          external_uid == o.external_uid &&
           system_id == o.system_id &&
           poam_id == o.poam_id &&
           display_poam_id == o.display_poam_id &&
           is_inherited == o.is_inherited &&
-          external_uid == o.external_uid &&
-          control_acronyms == o.control_acronyms &&
+          control_acronym == o.control_acronym &&
           cci == o.cci &&
           status == o.status &&
           review_status == o.review_status &&
@@ -525,7 +556,7 @@ module EmassClient
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [system_id, poam_id, display_poam_id, is_inherited, external_uid, control_acronyms, cci, status, review_status, vulnerability_description, source_ident_vuln, security_checks, milestones, poc_organization, poc_first_name, poc_last_name, poc_email, poc_phone_number, severity, raw_severity, relevance_of_threat, likelihood, impact, impact_description, residual_risk_level, recommendations, resources, scheduled_completion_date, completion_date, extension_date, comments, mitigation, is_active].hash
+      [external_uid, system_id, poam_id, display_poam_id, is_inherited, control_acronym, cci, status, review_status, vulnerability_description, source_ident_vuln, security_checks, milestones, poc_organization, poc_first_name, poc_last_name, poc_email, poc_phone_number, severity, raw_severity, relevance_of_threat, likelihood, impact, impact_description, residual_risk_level, recommendations, resources, scheduled_completion_date, completion_date, extension_date, comments, mitigation, is_active].hash
     end
 
     # Builds the object from hash
@@ -540,8 +571,11 @@ module EmassClient
     # @return [Object] Returns the model itself
     def build_from_hash(attributes)
       return nil unless attributes.is_a?(Hash)
+      attributes = attributes.transform_keys(&:to_sym)
       self.class.openapi_types.each_pair do |key, type|
-        if type =~ /\AArray<(.*)>/i
+        if attributes[self.class.attribute_map[key]].nil? && self.class.openapi_nullable.include?(key)
+          self.send("#{key}=", nil)
+        elsif type =~ /\AArray<(.*)>/i
           # check to ensure the input is an array given that the attribute
           # is documented as an array but the input is not
           if attributes[self.class.attribute_map[key]].is_a?(Array)
@@ -549,8 +583,6 @@ module EmassClient
           end
         elsif !attributes[self.class.attribute_map[key]].nil?
           self.send("#{key}=", _deserialize(type, attributes[self.class.attribute_map[key]]))
-        elsif attributes[self.class.attribute_map[key]].nil? && self.class.openapi_nullable.include?(key)
-          self.send("#{key}=", nil)
         end
       end
 
@@ -563,8 +595,8 @@ module EmassClient
     # @return [Object] Deserialized data
     def _deserialize(type, value)
       case type.to_sym
-      when :DateTime
-        DateTime.parse(value)
+      when :Time
+        Time.parse(value)
       when :Date
         Date.parse(value)
       when :String
@@ -594,7 +626,9 @@ module EmassClient
           end
         end
       else # model
-        EmassClient.const_get(type).build_from_hash(value)
+        # models (e.g. Pet) or oneOf
+        klass = EmassClient.const_get(type)
+        klass.respond_to?(:openapi_one_of) ? klass.build(value) : klass.build_from_hash(value)
       end
     end
 
@@ -642,5 +676,8 @@ module EmassClient
       else
         value
       end
-    end  end
+    end
+
+  end
+
 end