emass_client 3.10.1 → 3.12.0

data/lib/emass_client/models/pac_response_get.rb

@@ -1,12 +1,12 @@
 =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.   <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: 
+#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` POST endpoint to register the client certificate. The endpoint call returns the user `api-key`.</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 version of the OpenAPI document: v3.10
+The version of the OpenAPI document: v3.12
 Contact: disa.meade.id.mbx.emass-tier-iii-support@mail.mil
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 7.0.0-SNAPSHOT
+OpenAPI Generator version: 7.1.0-SNAPSHOT
 
 =end
 
@@ -76,6 +76,7 @@ module EmassClient
     # Show invalid properties with the reasons. Usually used together with valid?
     # @return Array for valid properties with the reasons
     def list_invalid_properties
+      warn '[DEPRECATED] the `list_invalid_properties` method is obsolete'
       invalid_properties = Array.new
       invalid_properties
     end
@@ -83,6 +84,7 @@ module EmassClient
     # Check to see if the all the properties in the model are valid
     # @return true if the model is valid
     def valid?
+      warn '[DEPRECATED] the `valid?` method is obsolete'
       true
     end
 
@@ -111,37 +113,30 @@ module EmassClient
     # @param [Hash] attributes Model attributes in the form of hash
     # @return [Object] Returns the model itself
     def self.build_from_hash(attributes)
-      new.build_from_hash(attributes)
-    end
-
-    # Builds the object from hash
-    # @param [Hash] attributes Model attributes in the form of hash
-    # @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 attributes[self.class.attribute_map[key]].nil? && self.class.openapi_nullable.include?(key)
-          self.send("#{key}=", nil)
+      transformed_hash = {}
+      openapi_types.each_pair do |key, type|
+        if attributes.key?(attribute_map[key]) && attributes[attribute_map[key]].nil?
+          transformed_hash["#{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)
-            self.send("#{key}=", attributes[self.class.attribute_map[key]].map { |v| _deserialize($1, v) })
+          if attributes[attribute_map[key]].is_a?(Array)
+            transformed_hash["#{key}"] = attributes[attribute_map[key]].map { |v| _deserialize($1, v) }
           end
-        elsif !attributes[self.class.attribute_map[key]].nil?
-          self.send("#{key}=", _deserialize(type, attributes[self.class.attribute_map[key]]))
+        elsif !attributes[attribute_map[key]].nil?
+          transformed_hash["#{key}"] = _deserialize(type, attributes[attribute_map[key]])
         end
       end
-
-      self
+      new(transformed_hash)
     end
 
     # Deserializes the data based on type
     # @param string type Data type
     # @param string value Value to be deserialized
     # @return [Object] Deserialized data
-    def _deserialize(type, value)
+    def self._deserialize(type, value)
       case type.to_sym
       when :Time
         Time.parse(value)

data/lib/emass_client/models/pac_response_post.rb

@@ -1,12 +1,12 @@
 =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.   <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: 
+#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` POST endpoint to register the client certificate. The endpoint call returns the user `api-key`.</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 version of the OpenAPI document: v3.10
+The version of the OpenAPI document: v3.12
 Contact: disa.meade.id.mbx.emass-tier-iii-support@mail.mil
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 7.0.0-SNAPSHOT
+OpenAPI Generator version: 7.1.0-SNAPSHOT
 
 =end
 
@@ -75,6 +75,7 @@ module EmassClient
     # Show invalid properties with the reasons. Usually used together with valid?
     # @return Array for valid properties with the reasons
     def list_invalid_properties
+      warn '[DEPRECATED] the `list_invalid_properties` method is obsolete'
       invalid_properties = Array.new
       invalid_properties
     end
@@ -82,6 +83,7 @@ module EmassClient
     # Check to see if the all the properties in the model are valid
     # @return true if the model is valid
     def valid?
+      warn '[DEPRECATED] the `valid?` method is obsolete'
       true
     end
 
@@ -110,37 +112,30 @@ module EmassClient
     # @param [Hash] attributes Model attributes in the form of hash
     # @return [Object] Returns the model itself
     def self.build_from_hash(attributes)
-      new.build_from_hash(attributes)
-    end
-
-    # Builds the object from hash
-    # @param [Hash] attributes Model attributes in the form of hash
-    # @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 attributes[self.class.attribute_map[key]].nil? && self.class.openapi_nullable.include?(key)
-          self.send("#{key}=", nil)
+      transformed_hash = {}
+      openapi_types.each_pair do |key, type|
+        if attributes.key?(attribute_map[key]) && attributes[attribute_map[key]].nil?
+          transformed_hash["#{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)
-            self.send("#{key}=", attributes[self.class.attribute_map[key]].map { |v| _deserialize($1, v) })
+          if attributes[attribute_map[key]].is_a?(Array)
+            transformed_hash["#{key}"] = attributes[attribute_map[key]].map { |v| _deserialize($1, v) }
           end
-        elsif !attributes[self.class.attribute_map[key]].nil?
-          self.send("#{key}=", _deserialize(type, attributes[self.class.attribute_map[key]]))
+        elsif !attributes[attribute_map[key]].nil?
+          transformed_hash["#{key}"] = _deserialize(type, attributes[attribute_map[key]])
         end
       end
-
-      self
+      new(transformed_hash)
     end
 
     # Deserializes the data based on type
     # @param string type Data type
     # @param string value Value to be deserialized
     # @return [Object] Deserialized data
-    def _deserialize(type, value)
+    def self._deserialize(type, value)
       case type.to_sym
       when :Time
         Time.parse(value)

data/lib/emass_client/models/poam_get.rb

@@ -1,12 +1,12 @@
 =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.   <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: 
+#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` POST endpoint to register the client certificate. The endpoint call returns the user `api-key`.</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 version of the OpenAPI document: v3.10
+The version of the OpenAPI document: v3.12
 Contact: disa.meade.id.mbx.emass-tier-iii-support@mail.mil
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 7.0.0-SNAPSHOT
+OpenAPI Generator version: 7.1.0-SNAPSHOT
 
 =end
 
@@ -15,9 +15,6 @@ 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
 
@@ -30,12 +27,18 @@ 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_acronym
 
     # [Optional] CCI associated with POA&M Item..
     attr_accessor :cci
 
+    # [Optional] The Security Control Assessment Procedure being associated with the POA&M Item.
+    attr_accessor :assessment_procedure
+
     # [Required] Values include the following: (Ongoing,Risk Accepted,Completed,Not Applicable
     attr_accessor :status
 
@@ -113,6 +116,51 @@ module EmassClient
     # [Conditional] Optionally used in PUT to delete milestones when updating a POA&M.
     attr_accessor :is_active
 
+    # [Optional] Indicate the risk level expected after any proposed mitigations are implemented. Proposed mitigations should be appropriately documented as POA&M milestones. Navy only.
+    attr_accessor :resulting_residual_risk_level_after_proposed_mitigations
+
+    # [Optional] A predisposing condition is a condition existing within an organization, a mission or business process, enterprise architecture, information system/PIT, or environment of operation, which affects (i.e., increases or decreases) the likelihood that threat events, once initiated, result in adverse impacts. Navy only.
+    attr_accessor :predisposing_conditions
+
+    # [Optional] Describe the identified threat(s) and relevance to the information system. Navy only.
+    attr_accessor :threat_description
+
+    # [Optional] List any affected devices by hostname. If all devices in the information system are affected, state 'system' or 'all'. Navy only
+    attr_accessor :devices_affected
+
+    # [Required] If not specified, this field will be set to false because it does not accept a null value. VA only
+    attr_accessor :identified_in_cfo_audit_or_other_review
+
+    # [Conditional] At least one of the following is required and must be completed for each POA&M Item:   Personnel Resources-> Funded Base Hours   Personnel Resources-> Unfunded Base Hours   Non-Personnel Resources-> Funded Amount   Non-Personnel Resources-> Unfunded Amount Displays numbers to the second decimal point (e.g., 100.00). VA only. 
+    attr_accessor :personnel_resources_funded_base_hours
+
+    # [Conditional] Required if Personnel Resources: Funded Base Hours is populated. Only accepts values present in the field's lookup table (modifiable by eMASS System Admins). VA only. 
+    attr_accessor :personnel_resources_cost_code
+
+    # [Conditional] At least one of the following is required and must be completed for each POA&M Item:   Personnel Resources-> Funded Base Hours   Personnel Resources-> Unfunded Base Hours   Non-Personnel Resources-> Funded Amount   Non-Personnel Resources-> Unfunded Amount Displays numbers to the second decimal point (e.g., 100.00). VA only. 
+    attr_accessor :personnel_resources_unfunded_base_hours
+
+    # [Conditional] Required if Personnel Resources: Unfunded Base Hours is populated. Only accepts values present in the field's lookup table (modifiable by eMASS System Admins). VA only. 
+    attr_accessor :personnel_resources_nonfunding_obstacle
+
+    # [Conditional] Required if the value \"Other\" is populated for the field Personnel Resources: Non-Funding Obstacle. VA only.
+    attr_accessor :personnel_resources_nonfunding_obstacle_other_reason
+
+    # [Conditional] At least one of the following is required and must be completed for each POA&M Item:   Personnel Resources-> Funded Base Hours   Personnel Resources-> Unfunded Base Hours   Non-Personnel Resources-> Funded Amount   Non-Personnel Resources-> Unfunded Amount Displays numbers to the second decimal point (e.g., 100.00). VA only. 
+    attr_accessor :non_personnel_resources_funded_amount
+
+    # [Conditional] Required if Non-Personnel Resources: Funded Amount is populated. Only accepts values present in the field's lookup table (modifiable by eMASS System Admins). VA only. 
+    attr_accessor :non_personnel_resources_cost_code
+
+    # [Conditional] At least one of the following is required and must be completed for each POA&M Item:   Personnel Resources-> Funded Base Hours   Personnel Resources-> Unfunded Base Hours   Non-Personnel Resources-> Funded Amount   Non-Personnel Resources-> Unfunded Amount Displays numbers to the second decimal point (e.g., 100.00). VA only. 
+    attr_accessor :non_personnel_resources_unfunded_amount
+
+    # [Conditional] Required if Non-Personnel Resources: Unfunded Amount is populated. Only accepts values present in the field's lookup table (modifiable by eMASS System Admins). VA only. 
+    attr_accessor :non_personnel_resources_nonfunding_obstacle
+
+    # [Conditional] Required if the value \"Other\" is populated for the field Non-Personnel Resources: Non-Funding Obstacle. VA only.
+    attr_accessor :non_personnel_resources_nonfunding_obstacle_other_reason
+
     class EnumAttributeValidator
       attr_reader :datatype
       attr_reader :allowable_values
@@ -138,13 +186,14 @@ 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_acronym' => :'controlAcronym',
         :'cci' => :'cci',
+        :'assessment_procedure' => :'assessmentProcedure',
         :'status' => :'status',
         :'review_status' => :'reviewStatus',
         :'vulnerability_description' => :'vulnerabilityDescription',
@@ -170,7 +219,22 @@ module EmassClient
         :'extension_date' => :'extensionDate',
         :'comments' => :'comments',
         :'mitigation' => :'mitigation',
-        :'is_active' => :'isActive'
+        :'is_active' => :'isActive',
+        :'resulting_residual_risk_level_after_proposed_mitigations' => :'resultingResidualRiskLevelAfterProposedMitigations',
+        :'predisposing_conditions' => :'predisposingConditions',
+        :'threat_description' => :'threatDescription',
+        :'devices_affected' => :'devicesAffected',
+        :'identified_in_cfo_audit_or_other_review' => :'identifiedInCFOAuditOrOtherReview',
+        :'personnel_resources_funded_base_hours' => :'personnelResourcesFundedBaseHours',
+        :'personnel_resources_cost_code' => :'personnelResourcesCostCode',
+        :'personnel_resources_unfunded_base_hours' => :'personnelResourcesUnfundedBaseHours',
+        :'personnel_resources_nonfunding_obstacle' => :'personnelResourcesNonfundingObstacle',
+        :'personnel_resources_nonfunding_obstacle_other_reason' => :'personnelResourcesNonfundingObstacleOtherReason',
+        :'non_personnel_resources_funded_amount' => :'nonPersonnelResourcesFundedAmount',
+        :'non_personnel_resources_cost_code' => :'nonPersonnelResourcesCostCode',
+        :'non_personnel_resources_unfunded_amount' => :'nonPersonnelResourcesUnfundedAmount',
+        :'non_personnel_resources_nonfunding_obstacle' => :'nonPersonnelResourcesNonfundingObstacle',
+        :'non_personnel_resources_nonfunding_obstacle_other_reason' => :'nonPersonnelResourcesNonfundingObstacleOtherReason'
       }
     end
 
@@ -182,13 +246,14 @@ module EmassClient
     # Attribute type mapping.
     def self.openapi_types
       {
-        :'external_uid' => :'String',
         :'system_id' => :'Integer',
         :'poam_id' => :'Integer',
         :'display_poam_id' => :'Integer',
         :'is_inherited' => :'Boolean',
+        :'external_uid' => :'String',
         :'control_acronym' => :'String',
         :'cci' => :'String',
+        :'assessment_procedure' => :'String',
         :'status' => :'String',
         :'review_status' => :'String',
         :'vulnerability_description' => :'String',
@@ -214,15 +279,30 @@ module EmassClient
         :'extension_date' => :'Integer',
         :'comments' => :'String',
         :'mitigation' => :'String',
-        :'is_active' => :'Boolean'
+        :'is_active' => :'Boolean',
+        :'resulting_residual_risk_level_after_proposed_mitigations' => :'String',
+        :'predisposing_conditions' => :'String',
+        :'threat_description' => :'String',
+        :'devices_affected' => :'String',
+        :'identified_in_cfo_audit_or_other_review' => :'Boolean',
+        :'personnel_resources_funded_base_hours' => :'Float',
+        :'personnel_resources_cost_code' => :'String',
+        :'personnel_resources_unfunded_base_hours' => :'Float',
+        :'personnel_resources_nonfunding_obstacle' => :'String',
+        :'personnel_resources_nonfunding_obstacle_other_reason' => :'String',
+        :'non_personnel_resources_funded_amount' => :'Float',
+        :'non_personnel_resources_cost_code' => :'String',
+        :'non_personnel_resources_unfunded_amount' => :'Float',
+        :'non_personnel_resources_nonfunding_obstacle' => :'String',
+        :'non_personnel_resources_nonfunding_obstacle_other_reason' => :'String'
       }
     end
 
     # List of attributes with nullable: true
     def self.openapi_nullable
       Set.new([
-        :'external_uid',
         :'is_inherited',
+        :'external_uid',
         :'control_acronym',
         :'cci',
         :'review_status',
@@ -244,7 +324,21 @@ module EmassClient
         :'extension_date',
         :'comments',
         :'mitigation',
-        :'is_active'
+        :'is_active',
+        :'resulting_residual_risk_level_after_proposed_mitigations',
+        :'predisposing_conditions',
+        :'threat_description',
+        :'devices_affected',
+        :'personnel_resources_funded_base_hours',
+        :'personnel_resources_cost_code',
+        :'personnel_resources_unfunded_base_hours',
+        :'personnel_resources_nonfunding_obstacle',
+        :'personnel_resources_nonfunding_obstacle_other_reason',
+        :'non_personnel_resources_funded_amount',
+        :'non_personnel_resources_cost_code',
+        :'non_personnel_resources_unfunded_amount',
+        :'non_personnel_resources_nonfunding_obstacle',
+        :'non_personnel_resources_nonfunding_obstacle_other_reason'
       ])
     end
 
@@ -263,10 +357,6 @@ 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
@@ -283,6 +373,10 @@ 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_acronym')
         self.control_acronym = attributes[:'control_acronym']
       end
@@ -291,6 +385,10 @@ module EmassClient
         self.cci = attributes[:'cci']
       end
 
+      if attributes.key?(:'assessment_procedure')
+        self.assessment_procedure = attributes[:'assessment_procedure']
+      end
+
       if attributes.key?(:'status')
         self.status = attributes[:'status']
       end
@@ -396,11 +494,72 @@ module EmassClient
       if attributes.key?(:'is_active')
         self.is_active = attributes[:'is_active']
       end
+
+      if attributes.key?(:'resulting_residual_risk_level_after_proposed_mitigations')
+        self.resulting_residual_risk_level_after_proposed_mitigations = attributes[:'resulting_residual_risk_level_after_proposed_mitigations']
+      end
+
+      if attributes.key?(:'predisposing_conditions')
+        self.predisposing_conditions = attributes[:'predisposing_conditions']
+      end
+
+      if attributes.key?(:'threat_description')
+        self.threat_description = attributes[:'threat_description']
+      end
+
+      if attributes.key?(:'devices_affected')
+        self.devices_affected = attributes[:'devices_affected']
+      end
+
+      if attributes.key?(:'identified_in_cfo_audit_or_other_review')
+        self.identified_in_cfo_audit_or_other_review = attributes[:'identified_in_cfo_audit_or_other_review']
+      end
+
+      if attributes.key?(:'personnel_resources_funded_base_hours')
+        self.personnel_resources_funded_base_hours = attributes[:'personnel_resources_funded_base_hours']
+      end
+
+      if attributes.key?(:'personnel_resources_cost_code')
+        self.personnel_resources_cost_code = attributes[:'personnel_resources_cost_code']
+      end
+
+      if attributes.key?(:'personnel_resources_unfunded_base_hours')
+        self.personnel_resources_unfunded_base_hours = attributes[:'personnel_resources_unfunded_base_hours']
+      end
+
+      if attributes.key?(:'personnel_resources_nonfunding_obstacle')
+        self.personnel_resources_nonfunding_obstacle = attributes[:'personnel_resources_nonfunding_obstacle']
+      end
+
+      if attributes.key?(:'personnel_resources_nonfunding_obstacle_other_reason')
+        self.personnel_resources_nonfunding_obstacle_other_reason = attributes[:'personnel_resources_nonfunding_obstacle_other_reason']
+      end
+
+      if attributes.key?(:'non_personnel_resources_funded_amount')
+        self.non_personnel_resources_funded_amount = attributes[:'non_personnel_resources_funded_amount']
+      end
+
+      if attributes.key?(:'non_personnel_resources_cost_code')
+        self.non_personnel_resources_cost_code = attributes[:'non_personnel_resources_cost_code']
+      end
+
+      if attributes.key?(:'non_personnel_resources_unfunded_amount')
+        self.non_personnel_resources_unfunded_amount = attributes[:'non_personnel_resources_unfunded_amount']
+      end
+
+      if attributes.key?(:'non_personnel_resources_nonfunding_obstacle')
+        self.non_personnel_resources_nonfunding_obstacle = attributes[:'non_personnel_resources_nonfunding_obstacle']
+      end
+
+      if attributes.key?(:'non_personnel_resources_nonfunding_obstacle_other_reason')
+        self.non_personnel_resources_nonfunding_obstacle_other_reason = attributes[:'non_personnel_resources_nonfunding_obstacle_other_reason']
+      end
     end
 
     # Show invalid properties with the reasons. Usually used together with valid?
     # @return Array for valid properties with the reasons
     def list_invalid_properties
+      warn '[DEPRECATED] the `list_invalid_properties` method is obsolete'
       invalid_properties = Array.new
       invalid_properties
     end
@@ -408,6 +567,7 @@ module EmassClient
     # Check to see if the all the properties in the model are valid
     # @return true if the model is valid
     def valid?
+      warn '[DEPRECATED] the `valid?` method is obsolete'
       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('String', ["Not Approved", "Under Review", "Approved", "unknown_default_open_api"])
@@ -424,6 +584,8 @@ module EmassClient
       return false unless impact_validator.valid?(@impact)
       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)
+      resulting_residual_risk_level_after_proposed_mitigations_validator = EnumAttributeValidator.new('String', ["Very Low", "Low", "Moderate", "High", "Very High", "unknown_default_open_api"])
+      return false unless resulting_residual_risk_level_after_proposed_mitigations_validator.valid?(@resulting_residual_risk_level_after_proposed_mitigations)
       true
     end
 
@@ -507,18 +669,29 @@ module EmassClient
       @residual_risk_level = residual_risk_level
     end
 
+    # Custom attribute writer method checking allowed values (enum).
+    # @param [Object] resulting_residual_risk_level_after_proposed_mitigations Object to be assigned
+    def resulting_residual_risk_level_after_proposed_mitigations=(resulting_residual_risk_level_after_proposed_mitigations)
+      validator = EnumAttributeValidator.new('String', ["Very Low", "Low", "Moderate", "High", "Very High", "unknown_default_open_api"])
+      unless validator.valid?(resulting_residual_risk_level_after_proposed_mitigations)
+        fail ArgumentError, "invalid value for \"resulting_residual_risk_level_after_proposed_mitigations\", must be one of #{validator.allowable_values}."
+      end
+      @resulting_residual_risk_level_after_proposed_mitigations = resulting_residual_risk_level_after_proposed_mitigations
+    end
+
     # Checks equality by comparing each attribute.
     # @param [Object] Object to be compared
     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_acronym == o.control_acronym &&
           cci == o.cci &&
+          assessment_procedure == o.assessment_procedure &&
           status == o.status &&
           review_status == o.review_status &&
           vulnerability_description == o.vulnerability_description &&
@@ -544,7 +717,22 @@ module EmassClient
           extension_date == o.extension_date &&
           comments == o.comments &&
           mitigation == o.mitigation &&
-          is_active == o.is_active
+          is_active == o.is_active &&
+          resulting_residual_risk_level_after_proposed_mitigations == o.resulting_residual_risk_level_after_proposed_mitigations &&
+          predisposing_conditions == o.predisposing_conditions &&
+          threat_description == o.threat_description &&
+          devices_affected == o.devices_affected &&
+          identified_in_cfo_audit_or_other_review == o.identified_in_cfo_audit_or_other_review &&
+          personnel_resources_funded_base_hours == o.personnel_resources_funded_base_hours &&
+          personnel_resources_cost_code == o.personnel_resources_cost_code &&
+          personnel_resources_unfunded_base_hours == o.personnel_resources_unfunded_base_hours &&
+          personnel_resources_nonfunding_obstacle == o.personnel_resources_nonfunding_obstacle &&
+          personnel_resources_nonfunding_obstacle_other_reason == o.personnel_resources_nonfunding_obstacle_other_reason &&
+          non_personnel_resources_funded_amount == o.non_personnel_resources_funded_amount &&
+          non_personnel_resources_cost_code == o.non_personnel_resources_cost_code &&
+          non_personnel_resources_unfunded_amount == o.non_personnel_resources_unfunded_amount &&
+          non_personnel_resources_nonfunding_obstacle == o.non_personnel_resources_nonfunding_obstacle &&
+          non_personnel_resources_nonfunding_obstacle_other_reason == o.non_personnel_resources_nonfunding_obstacle_other_reason
     end
 
     # @see the `==` method
@@ -556,44 +744,37 @@ module EmassClient
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def 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
+      [system_id, poam_id, display_poam_id, is_inherited, external_uid, control_acronym, cci, assessment_procedure, 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, resulting_residual_risk_level_after_proposed_mitigations, predisposing_conditions, threat_description, devices_affected, identified_in_cfo_audit_or_other_review, personnel_resources_funded_base_hours, personnel_resources_cost_code, personnel_resources_unfunded_base_hours, personnel_resources_nonfunding_obstacle, personnel_resources_nonfunding_obstacle_other_reason, non_personnel_resources_funded_amount, non_personnel_resources_cost_code, non_personnel_resources_unfunded_amount, non_personnel_resources_nonfunding_obstacle, non_personnel_resources_nonfunding_obstacle_other_reason].hash
     end
 
     # Builds the object from hash
     # @param [Hash] attributes Model attributes in the form of hash
     # @return [Object] Returns the model itself
     def self.build_from_hash(attributes)
-      new.build_from_hash(attributes)
-    end
-
-    # Builds the object from hash
-    # @param [Hash] attributes Model attributes in the form of hash
-    # @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 attributes[self.class.attribute_map[key]].nil? && self.class.openapi_nullable.include?(key)
-          self.send("#{key}=", nil)
+      transformed_hash = {}
+      openapi_types.each_pair do |key, type|
+        if attributes.key?(attribute_map[key]) && attributes[attribute_map[key]].nil?
+          transformed_hash["#{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)
-            self.send("#{key}=", attributes[self.class.attribute_map[key]].map { |v| _deserialize($1, v) })
+          if attributes[attribute_map[key]].is_a?(Array)
+            transformed_hash["#{key}"] = attributes[attribute_map[key]].map { |v| _deserialize($1, v) }
           end
-        elsif !attributes[self.class.attribute_map[key]].nil?
-          self.send("#{key}=", _deserialize(type, attributes[self.class.attribute_map[key]]))
+        elsif !attributes[attribute_map[key]].nil?
+          transformed_hash["#{key}"] = _deserialize(type, attributes[attribute_map[key]])
         end
       end
-
-      self
+      new(transformed_hash)
     end
 
     # Deserializes the data based on type
     # @param string type Data type
     # @param string value Value to be deserialized
     # @return [Object] Deserialized data
-    def _deserialize(type, value)
+    def self._deserialize(type, value)
       case type.to_sym
       when :Time
         Time.parse(value)