emass_client 3.10.1 → 3.22.0

data/lib/emass_client/models/{controls_get.rb → controls_response_get_data_inner.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 eMASS Representational State Transfer (REST) Application Programming Interface (API) enables users to perform assessments and complete actions associated with system records.  The eMASS API provides an interface for application to communicate eMASS Services. For information on how to register and use the eMASS API reference the [eMASS API Getting Started](eMASSGettingStarted.md).  Additional information about eMASS can be obtain by contacting the National Industrial Security Program (NISP). Points of Contact are: 
 
-The version of the OpenAPI document: v3.10
-Contact: disa.meade.id.mbx.emass-tier-iii-support@mail.mil
+The version of the OpenAPI document: v3.22
+Contact: disa.global.servicedesk.mbx.ma-ticket-request@mail.mil
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 7.0.0-SNAPSHOT
+Generator version: 7.12.0-SNAPSHOT
 
 =end
 
@@ -14,52 +14,31 @@ require 'date'
 require 'time'
 
 module EmassClient
-  class ControlsGet
-    # [Required] Unique system record identifier.
+  class ControlsResponseGetDataInner
+    # [Required] Unique eMASS system identifier.
     attr_accessor :system_id
 
-    # [Read-only] Name of the system record.
-    attr_accessor :name
-
     # [Required] Acronym of the system record.
     attr_accessor :acronym
 
-    # [Read-only] Comma separated list of CCIs associated with the control.
-    attr_accessor :ccis
-
-    # [Read-only] Indicates whether a control is inherited.
-    attr_accessor :is_inherited
-
-    # [Read-only] List of overlays that affect the control.
-    attr_accessor :modified_by_overlays
-
-    # [Read-only] Indicates the manner by which a control was included in the system’s categorization.
-    attr_accessor :included_status
-
-    # [Read-only] Compliance of the control.
-    attr_accessor :compliance_status
-
-    # [Required] Include written description of Responsible Entities that are responsible for the Security Control. Character Limit = 2,000.
+    # [Required] Include written description of Responsible Entities that are responsible for the Security Control. Character Limit 2,000.
     attr_accessor :responsible_entities
 
-    # [Optional] Implementation Status of the Security Control for the information system.
-    attr_accessor :implementation_status
-
-    # [Conditional] Indicate the type of Common Control Provider for an “Inherited” Security Control.
-    attr_accessor :common_control_provider
-
-    # [Conditional] Provide justification for Security Controls deemed Not Applicable to the system.
-    attr_accessor :na_justification
-
     # [Required] Control designations
     attr_accessor :control_designation
 
-    # [Required] Field is required for Implementation Plan.
+    # [Required] Field is required for Implementation Plan. Unix time format.
     attr_accessor :estimated_completion_date
 
-    # [Required] Includes security control comments. Character Limit = 2,000.
+    # [Required] Includes security control comments. Character Limit 2,000.
     attr_accessor :implementation_narrative
 
+    # [Conditional] Indicate the type of Common Control Provider for an Inherited Security Control.
+    attr_accessor :common_control_provider
+
+    # [Conditional] Provide justification for Security Controls deemed Not Applicable to the system.
+    attr_accessor :na_justification
+
     # [Conditional] Criticality of Security Control regarding SLCM. Character Limit = 2,000.
     attr_accessor :slcm_criticality
 
@@ -78,6 +57,9 @@ module EmassClient
     # [Conditional] Additional comments for Security Control regarding SLCM. Character Limit = 4,000.
     attr_accessor :slcm_comments
 
+    # [Optional] Implementation Status of the Security Control for the information system.
+    attr_accessor :implementation_status
+
     # [Optional] Values include the following options (Very Low, Low, Moderate,High,Very High)
     attr_accessor :severity
 
@@ -96,7 +78,7 @@ module EmassClient
     # [Optional] Values include the following options (Very Low, Low, Moderate,High,Very High)
     attr_accessor :impact
 
-    # [Optional] Include description of Security Control’s impact.
+    # [Optional] Include description of Security Control's impact.
     attr_accessor :impact_description
 
     # [Optional] Values include the following options (Very Low, Low, Moderate,High,Very High)
@@ -105,6 +87,36 @@ module EmassClient
     # [Optional] Identifies the assessment method / combination that will determine if the security requirements are implemented correctly.
     attr_accessor :test_method
 
+    # [Optional] Identify any mitigations in place for the Non-Compliant Security Control's vulnerabilities. Character Limit = 2,000.
+    attr_accessor :mitigations
+
+    # [Optional] If the Financial Management (Navy) overlay is applied to the system, this field appears and can be populated. Character Limit = 2,000. Navy only.
+    attr_accessor :application_layer
+
+    # [Optional] If the Financial Management (Navy) overlay is applied to the system, this field appears and can be populated. Navy only.
+    attr_accessor :database_layer
+
+    # [Optional] If the Financial Management (Navy) overlay is applied to the system, this field appears and can be populated. Navy only.
+    attr_accessor :operating_system_layer
+
+    # [Read-only] Name of the system record.
+    attr_accessor :name
+
+    # [Read-only] Comma separated list of CCIs associated with the control.
+    attr_accessor :ccis
+
+    # [Read-only] Indicates whether a control is inherited.
+    attr_accessor :is_inherited
+
+    # [Read-only] List of overlays that affect the control.
+    attr_accessor :modified_by_overlays
+
+    # [Read-only] Indicates the manner by which a control was included in the system's categorization.
+    attr_accessor :included_status
+
+    # [Read-only] Compliance of the control.
+    attr_accessor :compliance_status
+
     class EnumAttributeValidator
       attr_reader :datatype
       attr_reader :allowable_values
@@ -131,26 +143,20 @@ module EmassClient
     def self.attribute_map
       {
         :'system_id' => :'systemId',
-        :'name' => :'name',
         :'acronym' => :'acronym',
-        :'ccis' => :'ccis',
-        :'is_inherited' => :'isInherited',
-        :'modified_by_overlays' => :'modifiedByOverlays',
-        :'included_status' => :'includedStatus',
-        :'compliance_status' => :'complianceStatus',
         :'responsible_entities' => :'responsibleEntities',
-        :'implementation_status' => :'implementationStatus',
-        :'common_control_provider' => :'commonControlProvider',
-        :'na_justification' => :'naJustification',
         :'control_designation' => :'controlDesignation',
         :'estimated_completion_date' => :'estimatedCompletionDate',
         :'implementation_narrative' => :'implementationNarrative',
+        :'common_control_provider' => :'commonControlProvider',
+        :'na_justification' => :'naJustification',
         :'slcm_criticality' => :'slcmCriticality',
         :'slcm_frequency' => :'slcmFrequency',
         :'slcm_method' => :'slcmMethod',
         :'slcm_reporting' => :'slcmReporting',
         :'slcm_tracking' => :'slcmTracking',
         :'slcm_comments' => :'slcmComments',
+        :'implementation_status' => :'implementationStatus',
         :'severity' => :'severity',
         :'vulnerabilty_summary' => :'vulnerabiltySummary',
         :'recommendations' => :'recommendations',
@@ -159,39 +165,48 @@ module EmassClient
         :'impact' => :'impact',
         :'impact_description' => :'impactDescription',
         :'residual_risk_level' => :'residualRiskLevel',
-        :'test_method' => :'testMethod'
+        :'test_method' => :'testMethod',
+        :'mitigations' => :'mitigations',
+        :'application_layer' => :'applicationLayer',
+        :'database_layer' => :'databaseLayer',
+        :'operating_system_layer' => :'operatingSystemLayer',
+        :'name' => :'name',
+        :'ccis' => :'ccis',
+        :'is_inherited' => :'isInherited',
+        :'modified_by_overlays' => :'modifiedByOverlays',
+        :'included_status' => :'includedStatus',
+        :'compliance_status' => :'complianceStatus'
       }
     end
 
+    # Returns attribute mapping this model knows about
+    def self.acceptable_attribute_map
+      attribute_map
+    end
+
     # Returns all the JSON keys this model knows about
     def self.acceptable_attributes
-      attribute_map.values
+      acceptable_attribute_map.values
     end
 
     # Attribute type mapping.
     def self.openapi_types
       {
         :'system_id' => :'Integer',
-        :'name' => :'String',
         :'acronym' => :'String',
-        :'ccis' => :'String',
-        :'is_inherited' => :'Boolean',
-        :'modified_by_overlays' => :'String',
-        :'included_status' => :'String',
-        :'compliance_status' => :'String',
         :'responsible_entities' => :'String',
-        :'implementation_status' => :'String',
-        :'common_control_provider' => :'String',
-        :'na_justification' => :'String',
         :'control_designation' => :'String',
         :'estimated_completion_date' => :'Integer',
         :'implementation_narrative' => :'String',
+        :'common_control_provider' => :'String',
+        :'na_justification' => :'String',
         :'slcm_criticality' => :'String',
         :'slcm_frequency' => :'String',
         :'slcm_method' => :'String',
         :'slcm_reporting' => :'String',
         :'slcm_tracking' => :'String',
         :'slcm_comments' => :'String',
+        :'implementation_status' => :'String',
         :'severity' => :'String',
         :'vulnerabilty_summary' => :'String',
         :'recommendations' => :'String',
@@ -200,20 +215,23 @@ module EmassClient
         :'impact' => :'String',
         :'impact_description' => :'String',
         :'residual_risk_level' => :'String',
-        :'test_method' => :'String'
+        :'test_method' => :'String',
+        :'mitigations' => :'String',
+        :'application_layer' => :'String',
+        :'database_layer' => :'String',
+        :'operating_system_layer' => :'String',
+        :'name' => :'String',
+        :'ccis' => :'String',
+        :'is_inherited' => :'Boolean',
+        :'modified_by_overlays' => :'String',
+        :'included_status' => :'String',
+        :'compliance_status' => :'String'
       }
     end
 
     # List of attributes with nullable: true
     def self.openapi_nullable
       Set.new([
-        :'name',
-        :'ccis',
-        :'is_inherited',
-        :'modified_by_overlays',
-        :'included_status',
-        :'compliance_status',
-        :'implementation_status',
         :'common_control_provider',
         :'na_justification',
         :'slcm_criticality',
@@ -222,6 +240,7 @@ module EmassClient
         :'slcm_reporting',
         :'slcm_tracking',
         :'slcm_comments',
+        :'implementation_status',
         :'severity',
         :'vulnerabilty_summary',
         :'recommendations',
@@ -230,21 +249,43 @@ module EmassClient
         :'impact',
         :'impact_description',
         :'residual_risk_level',
-        :'test_method'
+        :'test_method',
+        :'mitigations',
+        :'application_layer',
+        :'database_layer',
+        :'operating_system_layer',
+        :'name',
+        :'ccis',
+        :'is_inherited',
+        :'modified_by_overlays',
+        :'included_status',
+        :'compliance_status'
       ])
     end
 
+    # List of class defined in allOf (OpenAPI v3)
+    def self.openapi_all_of
+      [
+      :'ControlsConditionalFields',
+      :'ControlsIds',
+      :'ControlsOptionalFields',
+      :'ControlsReadOnlyFields',
+      :'ControlsRequiredFields'
+      ]
+    end
+
     # Initializes the object
     # @param [Hash] attributes Model attributes in the form of hash
     def initialize(attributes = {})
       if (!attributes.is_a?(Hash))
-        fail ArgumentError, "The input argument (attributes) must be a hash in `EmassClient::ControlsGet` initialize method"
+        fail ArgumentError, "The input argument (attributes) must be a hash in `EmassClient::ControlsResponseGetDataInner` initialize method"
       end
 
       # check to see if the attribute exists and convert string to symbol for hash key
+      acceptable_attribute_map = self.class.acceptable_attribute_map
       attributes = attributes.each_with_object({}) { |(k, v), h|
-        if (!self.class.attribute_map.key?(k.to_sym))
-          fail ArgumentError, "`#{k}` is not a valid attribute in `EmassClient::ControlsGet`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
+        if (!acceptable_attribute_map.key?(k.to_sym))
+          fail ArgumentError, "`#{k}` is not a valid attribute in `EmassClient::ControlsResponseGetDataInner`. Please check the name to make sure it's valid. List of attributes: " + acceptable_attribute_map.keys.inspect
         end
         h[k.to_sym] = v
       }
@@ -253,50 +294,14 @@ module EmassClient
         self.system_id = attributes[:'system_id']
       end
 
-      if attributes.key?(:'name')
-        self.name = attributes[:'name']
-      end
-
       if attributes.key?(:'acronym')
         self.acronym = attributes[:'acronym']
       end
 
-      if attributes.key?(:'ccis')
-        self.ccis = attributes[:'ccis']
-      end
-
-      if attributes.key?(:'is_inherited')
-        self.is_inherited = attributes[:'is_inherited']
-      end
-
-      if attributes.key?(:'modified_by_overlays')
-        self.modified_by_overlays = attributes[:'modified_by_overlays']
-      end
-
-      if attributes.key?(:'included_status')
-        self.included_status = attributes[:'included_status']
-      end
-
-      if attributes.key?(:'compliance_status')
-        self.compliance_status = attributes[:'compliance_status']
-      end
-
       if attributes.key?(:'responsible_entities')
         self.responsible_entities = attributes[:'responsible_entities']
       end
 
-      if attributes.key?(:'implementation_status')
-        self.implementation_status = attributes[:'implementation_status']
-      end
-
-      if attributes.key?(:'common_control_provider')
-        self.common_control_provider = attributes[:'common_control_provider']
-      end
-
-      if attributes.key?(:'na_justification')
-        self.na_justification = attributes[:'na_justification']
-      end
-
       if attributes.key?(:'control_designation')
         self.control_designation = attributes[:'control_designation']
       end
@@ -309,6 +314,14 @@ module EmassClient
         self.implementation_narrative = attributes[:'implementation_narrative']
       end
 
+      if attributes.key?(:'common_control_provider')
+        self.common_control_provider = attributes[:'common_control_provider']
+      end
+
+      if attributes.key?(:'na_justification')
+        self.na_justification = attributes[:'na_justification']
+      end
+
       if attributes.key?(:'slcm_criticality')
         self.slcm_criticality = attributes[:'slcm_criticality']
       end
@@ -333,6 +346,10 @@ module EmassClient
         self.slcm_comments = attributes[:'slcm_comments']
       end
 
+      if attributes.key?(:'implementation_status')
+        self.implementation_status = attributes[:'implementation_status']
+      end
+
       if attributes.key?(:'severity')
         self.severity = attributes[:'severity']
       end
@@ -368,11 +385,52 @@ module EmassClient
       if attributes.key?(:'test_method')
         self.test_method = attributes[:'test_method']
       end
+
+      if attributes.key?(:'mitigations')
+        self.mitigations = attributes[:'mitigations']
+      end
+
+      if attributes.key?(:'application_layer')
+        self.application_layer = attributes[:'application_layer']
+      end
+
+      if attributes.key?(:'database_layer')
+        self.database_layer = attributes[:'database_layer']
+      end
+
+      if attributes.key?(:'operating_system_layer')
+        self.operating_system_layer = attributes[:'operating_system_layer']
+      end
+
+      if attributes.key?(:'name')
+        self.name = attributes[:'name']
+      end
+
+      if attributes.key?(:'ccis')
+        self.ccis = attributes[:'ccis']
+      end
+
+      if attributes.key?(:'is_inherited')
+        self.is_inherited = attributes[:'is_inherited']
+      end
+
+      if attributes.key?(:'modified_by_overlays')
+        self.modified_by_overlays = attributes[:'modified_by_overlays']
+      end
+
+      if attributes.key?(:'included_status')
+        self.included_status = attributes[:'included_status']
+      end
+
+      if attributes.key?(:'compliance_status')
+        self.compliance_status = attributes[:'compliance_status']
+      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
@@ -380,18 +438,17 @@ module EmassClient
     # Check to see if the all the properties in the model are valid
     # @return true if the model is valid
     def valid?
-      modified_by_overlays_validator = EnumAttributeValidator.new('String', ["Privacy", "Requirements", "Concurrency", "unknown_default_open_api"])
-      return false unless modified_by_overlays_validator.valid?(@modified_by_overlays)
-      implementation_status_validator = EnumAttributeValidator.new('String', ["Planned", "Implemented", "Inherited", "Not Applicable", "Manually Inherited", "unknown_default_open_api"])
-      return false unless implementation_status_validator.valid?(@implementation_status)
-      common_control_provider_validator = EnumAttributeValidator.new('String', ["DoD", "Component", "Enclave", "unknown_default_open_api"])
-      return false unless common_control_provider_validator.valid?(@common_control_provider)
+      warn '[DEPRECATED] the `valid?` method is obsolete'
       control_designation_validator = EnumAttributeValidator.new('String', ["Common", "System-Specific", "Hybrid", "unknown_default_open_api"])
       return false unless control_designation_validator.valid?(@control_designation)
+      common_control_provider_validator = EnumAttributeValidator.new('String', ["DoD", "Component", "Enclave", "unknown_default_open_api"])
+      return false unless common_control_provider_validator.valid?(@common_control_provider)
       slcm_frequency_validator = EnumAttributeValidator.new('String', ["Constantly", "Daily", "Weekly", "Monthly", "Quarterly", "Semi-Annually", "Annually", "Every Two Years", "Every Three Years", "Undetermined", "unknown_default_open_api"])
       return false unless slcm_frequency_validator.valid?(@slcm_frequency)
       slcm_method_validator = EnumAttributeValidator.new('String', ["Automated", "Semi-Automated", "Manual", "Undetermined", "unknown_default_open_api"])
       return false unless slcm_method_validator.valid?(@slcm_method)
+      implementation_status_validator = EnumAttributeValidator.new('String', ["Planned", "Implemented", "Inherited", "Not Applicable", "Manually Inherited", "unknown_default_open_api"])
+      return false unless implementation_status_validator.valid?(@implementation_status)
       severity_validator = EnumAttributeValidator.new('String', ["Very Low", "Low", "Moderate", "High", "Very High", "unknown_default_open_api"])
       return false unless severity_validator.valid?(@severity)
       relevance_of_threat_validator = EnumAttributeValidator.new('String', ["Very Low", "Low", "Moderate", "High", "Very High", "unknown_default_open_api"])
@@ -408,23 +465,13 @@ module EmassClient
     end
 
     # Custom attribute writer method checking allowed values (enum).
-    # @param [Object] modified_by_overlays Object to be assigned
-    def modified_by_overlays=(modified_by_overlays)
-      validator = EnumAttributeValidator.new('String', ["Privacy", "Requirements", "Concurrency", "unknown_default_open_api"])
-      unless validator.valid?(modified_by_overlays)
-        fail ArgumentError, "invalid value for \"modified_by_overlays\", must be one of #{validator.allowable_values}."
-      end
-      @modified_by_overlays = modified_by_overlays
-    end
-
-    # Custom attribute writer method checking allowed values (enum).
-    # @param [Object] implementation_status Object to be assigned
-    def implementation_status=(implementation_status)
-      validator = EnumAttributeValidator.new('String', ["Planned", "Implemented", "Inherited", "Not Applicable", "Manually Inherited", "unknown_default_open_api"])
-      unless validator.valid?(implementation_status)
-        fail ArgumentError, "invalid value for \"implementation_status\", must be one of #{validator.allowable_values}."
+    # @param [Object] control_designation Object to be assigned
+    def control_designation=(control_designation)
+      validator = EnumAttributeValidator.new('String', ["Common", "System-Specific", "Hybrid", "unknown_default_open_api"])
+      unless validator.valid?(control_designation)
+        fail ArgumentError, "invalid value for \"control_designation\", must be one of #{validator.allowable_values}."
       end
-      @implementation_status = implementation_status
+      @control_designation = control_designation
     end
 
     # Custom attribute writer method checking allowed values (enum).
@@ -437,16 +484,6 @@ module EmassClient
       @common_control_provider = common_control_provider
     end
 
-    # Custom attribute writer method checking allowed values (enum).
-    # @param [Object] control_designation Object to be assigned
-    def control_designation=(control_designation)
-      validator = EnumAttributeValidator.new('String', ["Common", "System-Specific", "Hybrid", "unknown_default_open_api"])
-      unless validator.valid?(control_designation)
-        fail ArgumentError, "invalid value for \"control_designation\", must be one of #{validator.allowable_values}."
-      end
-      @control_designation = control_designation
-    end
-
     # Custom attribute writer method checking allowed values (enum).
     # @param [Object] slcm_frequency Object to be assigned
     def slcm_frequency=(slcm_frequency)
@@ -467,6 +504,16 @@ module EmassClient
       @slcm_method = slcm_method
     end
 
+    # Custom attribute writer method checking allowed values (enum).
+    # @param [Object] implementation_status Object to be assigned
+    def implementation_status=(implementation_status)
+      validator = EnumAttributeValidator.new('String', ["Planned", "Implemented", "Inherited", "Not Applicable", "Manually Inherited", "unknown_default_open_api"])
+      unless validator.valid?(implementation_status)
+        fail ArgumentError, "invalid value for \"implementation_status\", must be one of #{validator.allowable_values}."
+      end
+      @implementation_status = implementation_status
+    end
+
     # Custom attribute writer method checking allowed values (enum).
     # @param [Object] severity Object to be assigned
     def severity=(severity)
@@ -533,26 +580,20 @@ module EmassClient
       return true if self.equal?(o)
       self.class == o.class &&
           system_id == o.system_id &&
-          name == o.name &&
           acronym == o.acronym &&
-          ccis == o.ccis &&
-          is_inherited == o.is_inherited &&
-          modified_by_overlays == o.modified_by_overlays &&
-          included_status == o.included_status &&
-          compliance_status == o.compliance_status &&
           responsible_entities == o.responsible_entities &&
-          implementation_status == o.implementation_status &&
-          common_control_provider == o.common_control_provider &&
-          na_justification == o.na_justification &&
           control_designation == o.control_designation &&
           estimated_completion_date == o.estimated_completion_date &&
           implementation_narrative == o.implementation_narrative &&
+          common_control_provider == o.common_control_provider &&
+          na_justification == o.na_justification &&
           slcm_criticality == o.slcm_criticality &&
           slcm_frequency == o.slcm_frequency &&
           slcm_method == o.slcm_method &&
           slcm_reporting == o.slcm_reporting &&
           slcm_tracking == o.slcm_tracking &&
           slcm_comments == o.slcm_comments &&
+          implementation_status == o.implementation_status &&
           severity == o.severity &&
           vulnerabilty_summary == o.vulnerabilty_summary &&
           recommendations == o.recommendations &&
@@ -561,7 +602,17 @@ module EmassClient
           impact == o.impact &&
           impact_description == o.impact_description &&
           residual_risk_level == o.residual_risk_level &&
-          test_method == o.test_method
+          test_method == o.test_method &&
+          mitigations == o.mitigations &&
+          application_layer == o.application_layer &&
+          database_layer == o.database_layer &&
+          operating_system_layer == o.operating_system_layer &&
+          name == o.name &&
+          ccis == o.ccis &&
+          is_inherited == o.is_inherited &&
+          modified_by_overlays == o.modified_by_overlays &&
+          included_status == o.included_status &&
+          compliance_status == o.compliance_status
     end
 
     # @see the `==` method
@@ -573,44 +624,37 @@ module EmassClient
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [system_id, name, acronym, ccis, is_inherited, modified_by_overlays, included_status, compliance_status, responsible_entities, implementation_status, common_control_provider, na_justification, control_designation, estimated_completion_date, implementation_narrative, slcm_criticality, slcm_frequency, slcm_method, slcm_reporting, slcm_tracking, slcm_comments, severity, vulnerabilty_summary, recommendations, relevance_of_threat, likelihood, impact, impact_description, residual_risk_level, test_method].hash
+      [system_id, acronym, responsible_entities, control_designation, estimated_completion_date, implementation_narrative, common_control_provider, na_justification, slcm_criticality, slcm_frequency, slcm_method, slcm_reporting, slcm_tracking, slcm_comments, implementation_status, severity, vulnerabilty_summary, recommendations, relevance_of_threat, likelihood, impact, impact_description, residual_risk_level, test_method, mitigations, application_layer, database_layer, operating_system_layer, name, ccis, is_inherited, modified_by_overlays, included_status, compliance_status].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)
@@ -645,7 +689,7 @@ module EmassClient
       else # model
         # 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)
+        klass.respond_to?(:openapi_any_of) || klass.respond_to?(:openapi_one_of) ? klass.build(value) : klass.build_from_hash(value)
       end
     end