@redhat-cloud-services/compliance-client 0.1.5 → 0.1.7

package/dist/api.js

@@ -13,10 +13,10 @@
  * Do not edit the class manually.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ProfileApi = exports.ProfileApiFactory = exports.ProfileApiFp = exports.ProfileApiAxiosParamCreator = exports.PolicySystemsApi = exports.PolicySystemsApiFactory = exports.PolicySystemsApiFp = exports.PolicySystemsApiAxiosParamCreator = exports.PolicyApi = exports.PolicyApiFactory = exports.PolicyApiFp = exports.PolicyApiAxiosParamCreator = exports.PoliciesApi = exports.PoliciesApiFactory = exports.PoliciesApiFp = exports.PoliciesApiAxiosParamCreator = exports.DeletePolicyApi = exports.DeletePolicyApiFactory = exports.DeletePolicyApiFp = exports.DeletePolicyApiAxiosParamCreator = exports.CreatePolicyApi = exports.CreatePolicyApiFactory = exports.CreatePolicyApiFp = exports.CreatePolicyApiAxiosParamCreator = exports.AssignSystemsApi = exports.AssignSystemsApiFactory = exports.AssignSystemsApiFp = exports.AssignSystemsApiAxiosParamCreator = exports.AssignSystemApi = exports.AssignSystemApiFactory = exports.AssignSystemApiFp = exports.AssignSystemApiAxiosParamCreator = exports.AssignRulesApi = exports.AssignRulesApiFactory = exports.AssignRulesApiFp = exports.AssignRulesApiAxiosParamCreator = exports.AssignRuleApi = exports.AssignRuleApiFactory = exports.AssignRuleApiFp = exports.AssignRuleApiAxiosParamCreator = exports.ValueDefinitionTypeEnum = exports.TailoringTypeEnum = exports.SystemTypeEnum = exports.SupportedProfileTypeEnum = exports.SecurityGuideTypeEnum = exports.RuleGroupTypeEnum = exports.RuleTypeEnum = exports.ReportTypeEnum = exports.ProfileTypeEnum = exports.PolicyTypeEnum = void 0;
-exports.SupportedProfilesApiFp = exports.SupportedProfilesApiAxiosParamCreator = exports.SecurityGuidesApi = exports.SecurityGuidesApiFactory = exports.SecurityGuidesApiFp = exports.SecurityGuidesApiAxiosParamCreator = exports.SecurityGuideRuleTreeApi = exports.SecurityGuideRuleTreeApiFactory = exports.SecurityGuideRuleTreeApiFp = exports.SecurityGuideRuleTreeApiAxiosParamCreator = exports.SecurityGuideApi = exports.SecurityGuideApiFactory = exports.SecurityGuideApiFp = exports.SecurityGuideApiAxiosParamCreator = exports.RulesApi = exports.RulesApiFactory = exports.RulesApiFp = exports.RulesApiAxiosParamCreator = exports.RuleGroupsApi = exports.RuleGroupsApiFactory = exports.RuleGroupsApiFp = exports.RuleGroupsApiAxiosParamCreator = exports.RuleGroupApi = exports.RuleGroupApiFactory = exports.RuleGroupApiFp = exports.RuleGroupApiAxiosParamCreator = exports.RuleApi = exports.RuleApiFactory = exports.RuleApiFp = exports.RuleApiAxiosParamCreator = exports.ReportsApi = exports.ReportsApiFactory = exports.ReportsApiFp = exports.ReportsApiAxiosParamCreator = exports.ReportApi = exports.ReportApiFactory = exports.ReportApiFp = exports.ReportApiAxiosParamCreator = exports.ProfilesApi = exports.ProfilesApiFactory = exports.ProfilesApiFp = exports.ProfilesApiAxiosParamCreator = exports.ProfileRulesApi = exports.ProfileRulesApiFactory = exports.ProfileRulesApiFp = exports.ProfileRulesApiAxiosParamCreator = exports.ProfileRuleApi = exports.ProfileRuleApiFactory = exports.ProfileRuleApiFp = exports.ProfileRuleApiAxiosParamCreator = void 0;
-exports.ValueDefinitionApi = exports.ValueDefinitionApiFactory = exports.ValueDefinitionApiFp = exports.ValueDefinitionApiAxiosParamCreator = exports.UpdateTailoringApi = exports.UpdateTailoringApiFactory = exports.UpdateTailoringApiFp = exports.UpdateTailoringApiAxiosParamCreator = exports.UpdatePolicyApi = exports.UpdatePolicyApiFactory = exports.UpdatePolicyApiFp = exports.UpdatePolicyApiAxiosParamCreator = exports.UnassignSystemApi = exports.UnassignSystemApiFactory = exports.UnassignSystemApiFp = exports.UnassignSystemApiAxiosParamCreator = exports.UnassignRuleApi = exports.UnassignRuleApiFactory = exports.UnassignRuleApiFp = exports.UnassignRuleApiAxiosParamCreator = exports.TailoringsApi = exports.TailoringsApiFactory = exports.TailoringsApiFp = exports.TailoringsApiAxiosParamCreator = exports.TailoringRulesApi = exports.TailoringRulesApiFactory = exports.TailoringRulesApiFp = exports.TailoringRulesApiAxiosParamCreator = exports.TailoringFileApi = exports.TailoringFileApiFactory = exports.TailoringFileApiFp = exports.TailoringFileApiAxiosParamCreator = exports.TailoringApi = exports.TailoringApiFactory = exports.TailoringApiFp = exports.TailoringApiAxiosParamCreator = exports.SystemsPoliciesApi = exports.SystemsPoliciesApiFactory = exports.SystemsPoliciesApiFp = exports.SystemsPoliciesApiAxiosParamCreator = exports.SystemsApi = exports.SystemsApiFactory = exports.SystemsApiFp = exports.SystemsApiAxiosParamCreator = exports.SystemApi = exports.SystemApiFactory = exports.SystemApiFp = exports.SystemApiAxiosParamCreator = exports.SupportedProfilesApi = exports.SupportedProfilesApiFactory = void 0;
-exports.ValueDefinitionsApi = exports.ValueDefinitionsApiFactory = exports.ValueDefinitionsApiFp = exports.ValueDefinitionsApiAxiosParamCreator = void 0;
+exports.PolicySystemsApiFactory = exports.PolicySystemsApiFp = exports.PolicySystemsApiAxiosParamCreator = exports.PolicyApi = exports.PolicyApiFactory = exports.PolicyApiFp = exports.PolicyApiAxiosParamCreator = exports.PoliciesApi = exports.PoliciesApiFactory = exports.PoliciesApiFp = exports.PoliciesApiAxiosParamCreator = exports.DeleteReportApi = exports.DeleteReportApiFactory = exports.DeleteReportApiFp = exports.DeleteReportApiAxiosParamCreator = exports.DeletePolicyApi = exports.DeletePolicyApiFactory = exports.DeletePolicyApiFp = exports.DeletePolicyApiAxiosParamCreator = exports.CreatePolicyApi = exports.CreatePolicyApiFactory = exports.CreatePolicyApiFp = exports.CreatePolicyApiAxiosParamCreator = exports.AssignSystemsApi = exports.AssignSystemsApiFactory = exports.AssignSystemsApiFp = exports.AssignSystemsApiAxiosParamCreator = exports.AssignSystemApi = exports.AssignSystemApiFactory = exports.AssignSystemApiFp = exports.AssignSystemApiAxiosParamCreator = exports.AssignRulesApi = exports.AssignRulesApiFactory = exports.AssignRulesApiFp = exports.AssignRulesApiAxiosParamCreator = exports.AssignRuleApi = exports.AssignRuleApiFactory = exports.AssignRuleApiFp = exports.AssignRuleApiAxiosParamCreator = exports.ValueDefinitionTypeEnum = exports.TestResultTypeEnum = exports.TailoringTypeEnum = exports.SystemTypeEnum = exports.SupportedProfileTypeEnum = exports.SecurityGuideTypeEnum = exports.RuleGroupTypeEnum = exports.RuleTypeEnum = exports.ReportTypeEnum = exports.ProfileTypeEnum = exports.PolicyTypeEnum = void 0;
+exports.RuleGroupsApiAxiosParamCreator = exports.RuleGroupApi = exports.RuleGroupApiFactory = exports.RuleGroupApiFp = exports.RuleGroupApiAxiosParamCreator = exports.RuleApi = exports.RuleApiFactory = exports.RuleApiFp = exports.RuleApiAxiosParamCreator = exports.ReportsApi = exports.ReportsApiFactory = exports.ReportsApiFp = exports.ReportsApiAxiosParamCreator = exports.ReportTestResultsApi = exports.ReportTestResultsApiFactory = exports.ReportTestResultsApiFp = exports.ReportTestResultsApiAxiosParamCreator = exports.ReportTestResultApi = exports.ReportTestResultApiFactory = exports.ReportTestResultApiFp = exports.ReportTestResultApiAxiosParamCreator = exports.ReportSystemsApi = exports.ReportSystemsApiFactory = exports.ReportSystemsApiFp = exports.ReportSystemsApiAxiosParamCreator = exports.ReportSystemApi = exports.ReportSystemApiFactory = exports.ReportSystemApiFp = exports.ReportSystemApiAxiosParamCreator = exports.ReportApi = exports.ReportApiFactory = exports.ReportApiFp = exports.ReportApiAxiosParamCreator = exports.ProfilesApi = exports.ProfilesApiFactory = exports.ProfilesApiFp = exports.ProfilesApiAxiosParamCreator = exports.ProfileRulesApi = exports.ProfileRulesApiFactory = exports.ProfileRulesApiFp = exports.ProfileRulesApiAxiosParamCreator = exports.ProfileRuleApi = exports.ProfileRuleApiFactory = exports.ProfileRuleApiFp = exports.ProfileRuleApiAxiosParamCreator = exports.ProfileApi = exports.ProfileApiFactory = exports.ProfileApiFp = exports.ProfileApiAxiosParamCreator = exports.PolicySystemsApi = void 0;
+exports.TailoringsApiFactory = exports.TailoringsApiFp = exports.TailoringsApiAxiosParamCreator = exports.TailoringRulesApi = exports.TailoringRulesApiFactory = exports.TailoringRulesApiFp = exports.TailoringRulesApiAxiosParamCreator = exports.TailoringFileApi = exports.TailoringFileApiFactory = exports.TailoringFileApiFp = exports.TailoringFileApiAxiosParamCreator = exports.TailoringApi = exports.TailoringApiFactory = exports.TailoringApiFp = exports.TailoringApiAxiosParamCreator = exports.SystemsPoliciesApi = exports.SystemsPoliciesApiFactory = exports.SystemsPoliciesApiFp = exports.SystemsPoliciesApiAxiosParamCreator = exports.SystemsApi = exports.SystemsApiFactory = exports.SystemsApiFp = exports.SystemsApiAxiosParamCreator = exports.SystemApi = exports.SystemApiFactory = exports.SystemApiFp = exports.SystemApiAxiosParamCreator = exports.SupportedProfilesApi = exports.SupportedProfilesApiFactory = exports.SupportedProfilesApiFp = exports.SupportedProfilesApiAxiosParamCreator = exports.SecurityGuidesApi = exports.SecurityGuidesApiFactory = exports.SecurityGuidesApiFp = exports.SecurityGuidesApiAxiosParamCreator = exports.SecurityGuideRuleTreeApi = exports.SecurityGuideRuleTreeApiFactory = exports.SecurityGuideRuleTreeApiFp = exports.SecurityGuideRuleTreeApiAxiosParamCreator = exports.SecurityGuideApi = exports.SecurityGuideApiFactory = exports.SecurityGuideApiFp = exports.SecurityGuideApiAxiosParamCreator = exports.RulesApi = exports.RulesApiFactory = exports.RulesApiFp = exports.RulesApiAxiosParamCreator = exports.RuleGroupsApi = exports.RuleGroupsApiFactory = exports.RuleGroupsApiFp = void 0;
+exports.ValueDefinitionsApi = exports.ValueDefinitionsApiFactory = exports.ValueDefinitionsApiFp = exports.ValueDefinitionsApiAxiosParamCreator = exports.ValueDefinitionApi = exports.ValueDefinitionApiFactory = exports.ValueDefinitionApiFp = exports.ValueDefinitionApiAxiosParamCreator = exports.UpdateTailoringApi = exports.UpdateTailoringApiFactory = exports.UpdateTailoringApiFp = exports.UpdateTailoringApiAxiosParamCreator = exports.UpdatePolicyApi = exports.UpdatePolicyApiFactory = exports.UpdatePolicyApiFp = exports.UpdatePolicyApiAxiosParamCreator = exports.UnassignSystemApi = exports.UnassignSystemApiFactory = exports.UnassignSystemApiFp = exports.UnassignSystemApiAxiosParamCreator = exports.UnassignRuleApi = exports.UnassignRuleApiFactory = exports.UnassignRuleApiFp = exports.UnassignRuleApiAxiosParamCreator = exports.TailoringsApi = void 0;
 var tslib_1 = require("tslib");
 var axios_1 = require("axios");
 // Some imports not used depending on template conditions
@@ -51,6 +51,9 @@ exports.SystemTypeEnum = {
 exports.TailoringTypeEnum = {
     Tailoring: 'tailoring'
 };
+exports.TestResultTypeEnum = {
+    TestResult: 'test_result'
+};
 exports.ValueDefinitionTypeEnum = {
     ValueDefinition: 'value_definition'
 };
@@ -66,12 +69,12 @@ var AssignRuleApiAxiosParamCreator = function (configuration) {
          * @summary Assign a Rule to a Tailoring
          * @param {any} policyId
          * @param {any} tailoringId
-         * @param {any} id
+         * @param {any} ruleId UUID or ref_id
          * @param {any} [xRHIDENTITY] For internal use only
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        assignRule: function (policyId, tailoringId, id, xRHIDENTITY, options) {
+        assignRule: function (policyId, tailoringId, ruleId, xRHIDENTITY, options) {
             if (options === void 0) { options = {}; }
             return tslib_1.__awaiter(_this, void 0, void 0, function () {
                 var localVarPath, localVarUrlObj, baseOptions, localVarRequestOptions, localVarHeaderParameter, localVarQueryParameter, headersFromBaseOptions;
@@ -80,12 +83,12 @@ var AssignRuleApiAxiosParamCreator = function (configuration) {
                     (0, common_1.assertParamExists)('assignRule', 'policyId', policyId);
                     // verify required parameter 'tailoringId' is not null or undefined
                     (0, common_1.assertParamExists)('assignRule', 'tailoringId', tailoringId);
-                    // verify required parameter 'id' is not null or undefined
-                    (0, common_1.assertParamExists)('assignRule', 'id', id);
-                    localVarPath = "/policies/{policy_id}/tailorings/{tailoring_id}/rules/{id}"
+                    // verify required parameter 'ruleId' is not null or undefined
+                    (0, common_1.assertParamExists)('assignRule', 'ruleId', ruleId);
+                    localVarPath = "/policies/{policy_id}/tailorings/{tailoring_id}/rules/{rule_id}"
                         .replace("{".concat("policy_id", "}"), encodeURIComponent(String(policyId)))
                         .replace("{".concat("tailoring_id", "}"), encodeURIComponent(String(tailoringId)))
-                        .replace("{".concat("id", "}"), encodeURIComponent(String(id)));
+                        .replace("{".concat("rule_id", "}"), encodeURIComponent(String(ruleId)));
                     localVarUrlObj = new URL(localVarPath, common_1.DUMMY_BASE_URL);
                     if (configuration) {
                         baseOptions = configuration.baseOptions;
@@ -123,17 +126,17 @@ var AssignRuleApiFp = function (configuration) {
          * @summary Assign a Rule to a Tailoring
          * @param {any} policyId
          * @param {any} tailoringId
-         * @param {any} id
+         * @param {any} ruleId UUID or ref_id
          * @param {any} [xRHIDENTITY] For internal use only
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        assignRule: function (policyId, tailoringId, id, xRHIDENTITY, options) {
+        assignRule: function (policyId, tailoringId, ruleId, xRHIDENTITY, options) {
             return tslib_1.__awaiter(this, void 0, void 0, function () {
                 var localVarAxiosArgs;
                 return tslib_1.__generator(this, function (_a) {
                     switch (_a.label) {
-                        case 0: return [4 /*yield*/, localVarAxiosParamCreator.assignRule(policyId, tailoringId, id, xRHIDENTITY, options)];
+                        case 0: return [4 /*yield*/, localVarAxiosParamCreator.assignRule(policyId, tailoringId, ruleId, xRHIDENTITY, options)];
                         case 1:
                             localVarAxiosArgs = _a.sent();
                             return [2 /*return*/, (0, common_1.createRequestFunction)(localVarAxiosArgs, axios_1.default, base_1.BASE_PATH, configuration)];
@@ -159,7 +162,7 @@ var AssignRuleApiFactory = function (configuration, basePath, axios) {
          * @throws {RequiredError}
          */
         assignRule: function (requestParameters, options) {
-            return localVarFp.assignRule(requestParameters.policyId, requestParameters.tailoringId, requestParameters.id, requestParameters.xRHIDENTITY, options).then(function (request) { return request(axios, basePath); });
+            return localVarFp.assignRule(requestParameters.policyId, requestParameters.tailoringId, requestParameters.ruleId, requestParameters.xRHIDENTITY, options).then(function (request) { return request(axios, basePath); });
         },
     };
 };
@@ -185,7 +188,7 @@ var AssignRuleApi = /** @class */ (function (_super) {
      */
     AssignRuleApi.prototype.assignRule = function (requestParameters, options) {
         var _this = this;
-        return (0, exports.AssignRuleApiFp)(this.configuration).assignRule(requestParameters.policyId, requestParameters.tailoringId, requestParameters.id, requestParameters.xRHIDENTITY, options).then(function (request) { return request(_this.axios, _this.basePath); });
+        return (0, exports.AssignRuleApiFp)(this.configuration).assignRule(requestParameters.policyId, requestParameters.tailoringId, requestParameters.ruleId, requestParameters.xRHIDENTITY, options).then(function (request) { return request(_this.axios, _this.basePath); });
     };
     return AssignRuleApi;
 }(base_1.BaseAPI));
@@ -339,23 +342,23 @@ var AssignSystemApiAxiosParamCreator = function (configuration) {
         /**
          * Assigns a System to a Policy
          * @summary Assign a System to a Policy
-         * @param {any} id
+         * @param {any} systemId
          * @param {any} policyId
          * @param {any} [xRHIDENTITY] For internal use only
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        assignSystem: function (id, policyId, xRHIDENTITY, options) {
+        assignSystem: function (systemId, policyId, xRHIDENTITY, options) {
             if (options === void 0) { options = {}; }
             return tslib_1.__awaiter(_this, void 0, void 0, function () {
                 var localVarPath, localVarUrlObj, baseOptions, localVarRequestOptions, localVarHeaderParameter, localVarQueryParameter, headersFromBaseOptions;
                 return tslib_1.__generator(this, function (_a) {
-                    // verify required parameter 'id' is not null or undefined
-                    (0, common_1.assertParamExists)('assignSystem', 'id', id);
+                    // verify required parameter 'systemId' is not null or undefined
+                    (0, common_1.assertParamExists)('assignSystem', 'systemId', systemId);
                     // verify required parameter 'policyId' is not null or undefined
                     (0, common_1.assertParamExists)('assignSystem', 'policyId', policyId);
-                    localVarPath = "/policies/{policy_id}/systems/{id}"
-                        .replace("{".concat("id", "}"), encodeURIComponent(String(id)))
+                    localVarPath = "/policies/{policy_id}/systems/{system_id}"
+                        .replace("{".concat("system_id", "}"), encodeURIComponent(String(systemId)))
                         .replace("{".concat("policy_id", "}"), encodeURIComponent(String(policyId)));
                     localVarUrlObj = new URL(localVarPath, common_1.DUMMY_BASE_URL);
                     if (configuration) {
@@ -392,18 +395,18 @@ var AssignSystemApiFp = function (configuration) {
         /**
          * Assigns a System to a Policy
          * @summary Assign a System to a Policy
-         * @param {any} id
+         * @param {any} systemId
          * @param {any} policyId
          * @param {any} [xRHIDENTITY] For internal use only
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        assignSystem: function (id, policyId, xRHIDENTITY, options) {
+        assignSystem: function (systemId, policyId, xRHIDENTITY, options) {
             return tslib_1.__awaiter(this, void 0, void 0, function () {
                 var localVarAxiosArgs;
                 return tslib_1.__generator(this, function (_a) {
                     switch (_a.label) {
-                        case 0: return [4 /*yield*/, localVarAxiosParamCreator.assignSystem(id, policyId, xRHIDENTITY, options)];
+                        case 0: return [4 /*yield*/, localVarAxiosParamCreator.assignSystem(systemId, policyId, xRHIDENTITY, options)];
                         case 1:
                             localVarAxiosArgs = _a.sent();
                             return [2 /*return*/, (0, common_1.createRequestFunction)(localVarAxiosArgs, axios_1.default, base_1.BASE_PATH, configuration)];
@@ -429,7 +432,7 @@ var AssignSystemApiFactory = function (configuration, basePath, axios) {
          * @throws {RequiredError}
          */
         assignSystem: function (requestParameters, options) {
-            return localVarFp.assignSystem(requestParameters.id, requestParameters.policyId, requestParameters.xRHIDENTITY, options).then(function (request) { return request(axios, basePath); });
+            return localVarFp.assignSystem(requestParameters.systemId, requestParameters.policyId, requestParameters.xRHIDENTITY, options).then(function (request) { return request(axios, basePath); });
         },
     };
 };
@@ -455,7 +458,7 @@ var AssignSystemApi = /** @class */ (function (_super) {
      */
     AssignSystemApi.prototype.assignSystem = function (requestParameters, options) {
         var _this = this;
-        return (0, exports.AssignSystemApiFp)(this.configuration).assignSystem(requestParameters.id, requestParameters.policyId, requestParameters.xRHIDENTITY, options).then(function (request) { return request(_this.axios, _this.basePath); });
+        return (0, exports.AssignSystemApiFp)(this.configuration).assignSystem(requestParameters.systemId, requestParameters.policyId, requestParameters.xRHIDENTITY, options).then(function (request) { return request(_this.axios, _this.basePath); });
     };
     return AssignSystemApi;
 }(base_1.BaseAPI));
@@ -731,20 +734,20 @@ var DeletePolicyApiAxiosParamCreator = function (configuration) {
         /**
          * Deletes a Policy
          * @summary Delete a Policy
-         * @param {any} id
+         * @param {any} policyId
          * @param {any} [xRHIDENTITY] For internal use only
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        deletePolicy: function (id, xRHIDENTITY, options) {
+        deletePolicy: function (policyId, xRHIDENTITY, options) {
             if (options === void 0) { options = {}; }
             return tslib_1.__awaiter(_this, void 0, void 0, function () {
                 var localVarPath, localVarUrlObj, baseOptions, localVarRequestOptions, localVarHeaderParameter, localVarQueryParameter, headersFromBaseOptions;
                 return tslib_1.__generator(this, function (_a) {
-                    // verify required parameter 'id' is not null or undefined
-                    (0, common_1.assertParamExists)('deletePolicy', 'id', id);
-                    localVarPath = "/policies/{id}"
-                        .replace("{".concat("id", "}"), encodeURIComponent(String(id)));
+                    // verify required parameter 'policyId' is not null or undefined
+                    (0, common_1.assertParamExists)('deletePolicy', 'policyId', policyId);
+                    localVarPath = "/policies/{policy_id}"
+                        .replace("{".concat("policy_id", "}"), encodeURIComponent(String(policyId)));
                     localVarUrlObj = new URL(localVarPath, common_1.DUMMY_BASE_URL);
                     if (configuration) {
                         baseOptions = configuration.baseOptions;
@@ -780,17 +783,17 @@ var DeletePolicyApiFp = function (configuration) {
         /**
          * Deletes a Policy
          * @summary Delete a Policy
-         * @param {any} id
+         * @param {any} policyId
          * @param {any} [xRHIDENTITY] For internal use only
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        deletePolicy: function (id, xRHIDENTITY, options) {
+        deletePolicy: function (policyId, xRHIDENTITY, options) {
             return tslib_1.__awaiter(this, void 0, void 0, function () {
                 var localVarAxiosArgs;
                 return tslib_1.__generator(this, function (_a) {
                     switch (_a.label) {
-                        case 0: return [4 /*yield*/, localVarAxiosParamCreator.deletePolicy(id, xRHIDENTITY, options)];
+                        case 0: return [4 /*yield*/, localVarAxiosParamCreator.deletePolicy(policyId, xRHIDENTITY, options)];
                         case 1:
                             localVarAxiosArgs = _a.sent();
                             return [2 /*return*/, (0, common_1.createRequestFunction)(localVarAxiosArgs, axios_1.default, base_1.BASE_PATH, configuration)];
@@ -816,7 +819,7 @@ var DeletePolicyApiFactory = function (configuration, basePath, axios) {
          * @throws {RequiredError}
          */
         deletePolicy: function (requestParameters, options) {
-            return localVarFp.deletePolicy(requestParameters.id, requestParameters.xRHIDENTITY, options).then(function (request) { return request(axios, basePath); });
+            return localVarFp.deletePolicy(requestParameters.policyId, requestParameters.xRHIDENTITY, options).then(function (request) { return request(axios, basePath); });
         },
     };
 };
@@ -842,11 +845,137 @@ var DeletePolicyApi = /** @class */ (function (_super) {
      */
     DeletePolicyApi.prototype.deletePolicy = function (requestParameters, options) {
         var _this = this;
-        return (0, exports.DeletePolicyApiFp)(this.configuration).deletePolicy(requestParameters.id, requestParameters.xRHIDENTITY, options).then(function (request) { return request(_this.axios, _this.basePath); });
+        return (0, exports.DeletePolicyApiFp)(this.configuration).deletePolicy(requestParameters.policyId, requestParameters.xRHIDENTITY, options).then(function (request) { return request(_this.axios, _this.basePath); });
     };
     return DeletePolicyApi;
 }(base_1.BaseAPI));
 exports.DeletePolicyApi = DeletePolicyApi;
+/**
+ * DeleteReportApi - axios parameter creator
+ * @export
+ */
+var DeleteReportApiAxiosParamCreator = function (configuration) {
+    var _this = this;
+    return {
+        /**
+         * Deletes a Report results
+         * @summary Delete a Report results
+         * @param {any} reportId
+         * @param {any} [xRHIDENTITY] For internal use only
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        deleteReport: function (reportId, xRHIDENTITY, options) {
+            if (options === void 0) { options = {}; }
+            return tslib_1.__awaiter(_this, void 0, void 0, function () {
+                var localVarPath, localVarUrlObj, baseOptions, localVarRequestOptions, localVarHeaderParameter, localVarQueryParameter, headersFromBaseOptions;
+                return tslib_1.__generator(this, function (_a) {
+                    // verify required parameter 'reportId' is not null or undefined
+                    (0, common_1.assertParamExists)('deleteReport', 'reportId', reportId);
+                    localVarPath = "/reports/{report_id}"
+                        .replace("{".concat("report_id", "}"), encodeURIComponent(String(reportId)));
+                    localVarUrlObj = new URL(localVarPath, common_1.DUMMY_BASE_URL);
+                    if (configuration) {
+                        baseOptions = configuration.baseOptions;
+                    }
+                    localVarRequestOptions = tslib_1.__assign(tslib_1.__assign({ method: 'DELETE' }, baseOptions), options);
+                    localVarHeaderParameter = {};
+                    localVarQueryParameter = {};
+                    if (xRHIDENTITY != null) {
+                        localVarHeaderParameter['X-RH-IDENTITY'] = typeof xRHIDENTITY === 'string'
+                            ? xRHIDENTITY
+                            : JSON.stringify(xRHIDENTITY);
+                    }
+                    (0, common_1.setSearchParams)(localVarUrlObj, localVarQueryParameter);
+                    headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+                    localVarRequestOptions.headers = tslib_1.__assign(tslib_1.__assign(tslib_1.__assign({}, localVarHeaderParameter), headersFromBaseOptions), options.headers);
+                    return [2 /*return*/, {
+                            url: (0, common_1.toPathString)(localVarUrlObj),
+                            options: localVarRequestOptions,
+                        }];
+                });
+            });
+        },
+    };
+};
+exports.DeleteReportApiAxiosParamCreator = DeleteReportApiAxiosParamCreator;
+/**
+ * DeleteReportApi - functional programming interface
+ * @export
+ */
+var DeleteReportApiFp = function (configuration) {
+    var localVarAxiosParamCreator = (0, exports.DeleteReportApiAxiosParamCreator)(configuration);
+    return {
+        /**
+         * Deletes a Report results
+         * @summary Delete a Report results
+         * @param {any} reportId
+         * @param {any} [xRHIDENTITY] For internal use only
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        deleteReport: function (reportId, xRHIDENTITY, options) {
+            return tslib_1.__awaiter(this, void 0, void 0, function () {
+                var localVarAxiosArgs;
+                return tslib_1.__generator(this, function (_a) {
+                    switch (_a.label) {
+                        case 0: return [4 /*yield*/, localVarAxiosParamCreator.deleteReport(reportId, xRHIDENTITY, options)];
+                        case 1:
+                            localVarAxiosArgs = _a.sent();
+                            return [2 /*return*/, (0, common_1.createRequestFunction)(localVarAxiosArgs, axios_1.default, base_1.BASE_PATH, configuration)];
+                    }
+                });
+            });
+        },
+    };
+};
+exports.DeleteReportApiFp = DeleteReportApiFp;
+/**
+ * DeleteReportApi - factory interface
+ * @export
+ */
+var DeleteReportApiFactory = function (configuration, basePath, axios) {
+    var localVarFp = (0, exports.DeleteReportApiFp)(configuration);
+    return {
+        /**
+         * Deletes a Report results
+         * @summary Delete a Report results
+         * @param {DeleteReportApiDeleteReportRequest} requestParameters Request parameters.
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        deleteReport: function (requestParameters, options) {
+            return localVarFp.deleteReport(requestParameters.reportId, requestParameters.xRHIDENTITY, options).then(function (request) { return request(axios, basePath); });
+        },
+    };
+};
+exports.DeleteReportApiFactory = DeleteReportApiFactory;
+/**
+ * DeleteReportApi - object-oriented interface
+ * @export
+ * @class DeleteReportApi
+ * @extends {BaseAPI}
+ */
+var DeleteReportApi = /** @class */ (function (_super) {
+    tslib_1.__extends(DeleteReportApi, _super);
+    function DeleteReportApi() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    /**
+     * Deletes a Report results
+     * @summary Delete a Report results
+     * @param {DeleteReportApiDeleteReportRequest} requestParameters Request parameters.
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof DeleteReportApi
+     */
+    DeleteReportApi.prototype.deleteReport = function (requestParameters, options) {
+        var _this = this;
+        return (0, exports.DeleteReportApiFp)(this.configuration).deleteReport(requestParameters.reportId, requestParameters.xRHIDENTITY, options).then(function (request) { return request(_this.axios, _this.basePath); });
+    };
+    return DeleteReportApi;
+}(base_1.BaseAPI));
+exports.DeleteReportApi = DeleteReportApi;
 /**
  * PoliciesApi - axios parameter creator
  * @export
@@ -1000,20 +1129,20 @@ var PolicyApiAxiosParamCreator = function (configuration) {
         /**
          * Returns a Policy
          * @summary Request a Policy
-         * @param {any} id
+         * @param {any} policyId
          * @param {any} [xRHIDENTITY] For internal use only
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        policy: function (id, xRHIDENTITY, options) {
+        policy: function (policyId, xRHIDENTITY, options) {
             if (options === void 0) { options = {}; }
             return tslib_1.__awaiter(_this, void 0, void 0, function () {
                 var localVarPath, localVarUrlObj, baseOptions, localVarRequestOptions, localVarHeaderParameter, localVarQueryParameter, headersFromBaseOptions;
                 return tslib_1.__generator(this, function (_a) {
-                    // verify required parameter 'id' is not null or undefined
-                    (0, common_1.assertParamExists)('policy', 'id', id);
-                    localVarPath = "/policies/{id}"
-                        .replace("{".concat("id", "}"), encodeURIComponent(String(id)));
+                    // verify required parameter 'policyId' is not null or undefined
+                    (0, common_1.assertParamExists)('policy', 'policyId', policyId);
+                    localVarPath = "/policies/{policy_id}"
+                        .replace("{".concat("policy_id", "}"), encodeURIComponent(String(policyId)));
                     localVarUrlObj = new URL(localVarPath, common_1.DUMMY_BASE_URL);
                     if (configuration) {
                         baseOptions = configuration.baseOptions;
@@ -1049,17 +1178,17 @@ var PolicyApiFp = function (configuration) {
         /**
          * Returns a Policy
          * @summary Request a Policy
-         * @param {any} id
+         * @param {any} policyId
          * @param {any} [xRHIDENTITY] For internal use only
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        policy: function (id, xRHIDENTITY, options) {
+        policy: function (policyId, xRHIDENTITY, options) {
             return tslib_1.__awaiter(this, void 0, void 0, function () {
                 var localVarAxiosArgs;
                 return tslib_1.__generator(this, function (_a) {
                     switch (_a.label) {
-                        case 0: return [4 /*yield*/, localVarAxiosParamCreator.policy(id, xRHIDENTITY, options)];
+                        case 0: return [4 /*yield*/, localVarAxiosParamCreator.policy(policyId, xRHIDENTITY, options)];
                         case 1:
                             localVarAxiosArgs = _a.sent();
                             return [2 /*return*/, (0, common_1.createRequestFunction)(localVarAxiosArgs, axios_1.default, base_1.BASE_PATH, configuration)];
@@ -1085,7 +1214,7 @@ var PolicyApiFactory = function (configuration, basePath, axios) {
          * @throws {RequiredError}
          */
         policy: function (requestParameters, options) {
-            return localVarFp.policy(requestParameters.id, requestParameters.xRHIDENTITY, options).then(function (request) { return request(axios, basePath); });
+            return localVarFp.policy(requestParameters.policyId, requestParameters.xRHIDENTITY, options).then(function (request) { return request(axios, basePath); });
         },
     };
 };
@@ -1111,7 +1240,7 @@ var PolicyApi = /** @class */ (function (_super) {
      */
     PolicyApi.prototype.policy = function (requestParameters, options) {
         var _this = this;
-        return (0, exports.PolicyApiFp)(this.configuration).policy(requestParameters.id, requestParameters.xRHIDENTITY, options).then(function (request) { return request(_this.axios, _this.basePath); });
+        return (0, exports.PolicyApiFp)(this.configuration).policy(requestParameters.policyId, requestParameters.xRHIDENTITY, options).then(function (request) { return request(_this.axios, _this.basePath); });
     };
     return PolicyApi;
 }(base_1.BaseAPI));
@@ -1131,7 +1260,7 @@ var PolicySystemsApiAxiosParamCreator = function (configuration) {
          * @param {any} [limit] Number of items to return per page
          * @param {any} [offset] Offset of first item of paginated response
          * @param {any} [sortBy] Attribute and direction to sort the items by. Represented by an array of fields with an optional direction (`<key>:asc` or `<key>:desc`).<br><br>If no direction is selected, `<key>:asc` is used by default.
-         * @param {any} [filter] Query string to filter items by their attributes. Compliant with <a href=\"https://github.com/wvanbergen/scoped_search/wiki/Query-language\" target=\"_blank\" title=\"github.com/wvanbergen/scoped_search\">scoped_search query language</a>. However, only `=` or `!=` (resp. `<>`) operators are supported.<br><br>Systems are searchable using attributes `display_name`, `os_major_version`, `os_minor_version`, and `assigned_or_scanned`<br><br>(e.g.: `(field_1=something AND field_2!=\"something else\") OR field_3>40`)
+         * @param {any} [filter] Query string to filter items by their attributes. Compliant with <a href=\"https://github.com/wvanbergen/scoped_search/wiki/Query-language\" target=\"_blank\" title=\"github.com/wvanbergen/scoped_search\">scoped_search query language</a>. However, only `=` or `!=` (resp. `<>`) operators are supported.<br><br>Systems are searchable using attributes `display_name`, `os_major_version`, `os_minor_version`, `assigned_or_scanned`, and `never_reported`<br><br>(e.g.: `(field_1=something AND field_2!=\"something else\") OR field_3>40`)
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
@@ -1196,7 +1325,7 @@ var PolicySystemsApiFp = function (configuration) {
          * @param {any} [limit] Number of items to return per page
          * @param {any} [offset] Offset of first item of paginated response
          * @param {any} [sortBy] Attribute and direction to sort the items by. Represented by an array of fields with an optional direction (`<key>:asc` or `<key>:desc`).<br><br>If no direction is selected, `<key>:asc` is used by default.
-         * @param {any} [filter] Query string to filter items by their attributes. Compliant with <a href=\"https://github.com/wvanbergen/scoped_search/wiki/Query-language\" target=\"_blank\" title=\"github.com/wvanbergen/scoped_search\">scoped_search query language</a>. However, only `=` or `!=` (resp. `<>`) operators are supported.<br><br>Systems are searchable using attributes `display_name`, `os_major_version`, `os_minor_version`, and `assigned_or_scanned`<br><br>(e.g.: `(field_1=something AND field_2!=\"something else\") OR field_3>40`)
+         * @param {any} [filter] Query string to filter items by their attributes. Compliant with <a href=\"https://github.com/wvanbergen/scoped_search/wiki/Query-language\" target=\"_blank\" title=\"github.com/wvanbergen/scoped_search\">scoped_search query language</a>. However, only `=` or `!=` (resp. `<>`) operators are supported.<br><br>Systems are searchable using attributes `display_name`, `os_major_version`, `os_minor_version`, `assigned_or_scanned`, and `never_reported`<br><br>(e.g.: `(field_1=something AND field_2!=\"something else\") OR field_3>40`)
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
@@ -1273,23 +1402,23 @@ var ProfileApiAxiosParamCreator = function (configuration) {
          * Returns a Profile
          * @summary Request a Profile
          * @param {any} securityGuideId
-         * @param {any} id
+         * @param {any} profileId UUID or ref_id
          * @param {any} [xRHIDENTITY] For internal use only
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        profile: function (securityGuideId, id, xRHIDENTITY, options) {
+        profile: function (securityGuideId, profileId, xRHIDENTITY, options) {
             if (options === void 0) { options = {}; }
             return tslib_1.__awaiter(_this, void 0, void 0, function () {
                 var localVarPath, localVarUrlObj, baseOptions, localVarRequestOptions, localVarHeaderParameter, localVarQueryParameter, headersFromBaseOptions;
                 return tslib_1.__generator(this, function (_a) {
                     // verify required parameter 'securityGuideId' is not null or undefined
                     (0, common_1.assertParamExists)('profile', 'securityGuideId', securityGuideId);
-                    // verify required parameter 'id' is not null or undefined
-                    (0, common_1.assertParamExists)('profile', 'id', id);
-                    localVarPath = "/security_guides/{security_guide_id}/profiles/{id}"
+                    // verify required parameter 'profileId' is not null or undefined
+                    (0, common_1.assertParamExists)('profile', 'profileId', profileId);
+                    localVarPath = "/security_guides/{security_guide_id}/profiles/{profile_id}"
                         .replace("{".concat("security_guide_id", "}"), encodeURIComponent(String(securityGuideId)))
-                        .replace("{".concat("id", "}"), encodeURIComponent(String(id)));
+                        .replace("{".concat("profile_id", "}"), encodeURIComponent(String(profileId)));
                     localVarUrlObj = new URL(localVarPath, common_1.DUMMY_BASE_URL);
                     if (configuration) {
                         baseOptions = configuration.baseOptions;
@@ -1326,17 +1455,17 @@ var ProfileApiFp = function (configuration) {
          * Returns a Profile
          * @summary Request a Profile
          * @param {any} securityGuideId
-         * @param {any} id
+         * @param {any} profileId UUID or ref_id
          * @param {any} [xRHIDENTITY] For internal use only
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        profile: function (securityGuideId, id, xRHIDENTITY, options) {
+        profile: function (securityGuideId, profileId, xRHIDENTITY, options) {
             return tslib_1.__awaiter(this, void 0, void 0, function () {
                 var localVarAxiosArgs;
                 return tslib_1.__generator(this, function (_a) {
                     switch (_a.label) {
-                        case 0: return [4 /*yield*/, localVarAxiosParamCreator.profile(securityGuideId, id, xRHIDENTITY, options)];
+                        case 0: return [4 /*yield*/, localVarAxiosParamCreator.profile(securityGuideId, profileId, xRHIDENTITY, options)];
                         case 1:
                             localVarAxiosArgs = _a.sent();
                             return [2 /*return*/, (0, common_1.createRequestFunction)(localVarAxiosArgs, axios_1.default, base_1.BASE_PATH, configuration)];
@@ -1362,7 +1491,7 @@ var ProfileApiFactory = function (configuration, basePath, axios) {
          * @throws {RequiredError}
          */
         profile: function (requestParameters, options) {
-            return localVarFp.profile(requestParameters.securityGuideId, requestParameters.id, requestParameters.xRHIDENTITY, options).then(function (request) { return request(axios, basePath); });
+            return localVarFp.profile(requestParameters.securityGuideId, requestParameters.profileId, requestParameters.xRHIDENTITY, options).then(function (request) { return request(axios, basePath); });
         },
     };
 };
@@ -1388,7 +1517,7 @@ var ProfileApi = /** @class */ (function (_super) {
      */
     ProfileApi.prototype.profile = function (requestParameters, options) {
         var _this = this;
-        return (0, exports.ProfileApiFp)(this.configuration).profile(requestParameters.securityGuideId, requestParameters.id, requestParameters.xRHIDENTITY, options).then(function (request) { return request(_this.axios, _this.basePath); });
+        return (0, exports.ProfileApiFp)(this.configuration).profile(requestParameters.securityGuideId, requestParameters.profileId, requestParameters.xRHIDENTITY, options).then(function (request) { return request(_this.axios, _this.basePath); });
     };
     return ProfileApi;
 }(base_1.BaseAPI));
@@ -1405,12 +1534,12 @@ var ProfileRuleApiAxiosParamCreator = function (configuration) {
          * @summary Request a Rule assigned to a Profile
          * @param {any} securityGuideId
          * @param {any} profileId
-         * @param {any} id
+         * @param {any} ruleId UUID or ref_id
          * @param {any} [xRHIDENTITY] For internal use only
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        profileRule: function (securityGuideId, profileId, id, xRHIDENTITY, options) {
+        profileRule: function (securityGuideId, profileId, ruleId, xRHIDENTITY, options) {
             if (options === void 0) { options = {}; }
             return tslib_1.__awaiter(_this, void 0, void 0, function () {
                 var localVarPath, localVarUrlObj, baseOptions, localVarRequestOptions, localVarHeaderParameter, localVarQueryParameter, headersFromBaseOptions;
@@ -1419,12 +1548,12 @@ var ProfileRuleApiAxiosParamCreator = function (configuration) {
                     (0, common_1.assertParamExists)('profileRule', 'securityGuideId', securityGuideId);
                     // verify required parameter 'profileId' is not null or undefined
                     (0, common_1.assertParamExists)('profileRule', 'profileId', profileId);
-                    // verify required parameter 'id' is not null or undefined
-                    (0, common_1.assertParamExists)('profileRule', 'id', id);
-                    localVarPath = "/security_guides/{security_guide_id}/profiles/{profile_id}/rules/{id}"
+                    // verify required parameter 'ruleId' is not null or undefined
+                    (0, common_1.assertParamExists)('profileRule', 'ruleId', ruleId);
+                    localVarPath = "/security_guides/{security_guide_id}/profiles/{profile_id}/rules/{rule_id}"
                         .replace("{".concat("security_guide_id", "}"), encodeURIComponent(String(securityGuideId)))
                         .replace("{".concat("profile_id", "}"), encodeURIComponent(String(profileId)))
-                        .replace("{".concat("id", "}"), encodeURIComponent(String(id)));
+                        .replace("{".concat("rule_id", "}"), encodeURIComponent(String(ruleId)));
                     localVarUrlObj = new URL(localVarPath, common_1.DUMMY_BASE_URL);
                     if (configuration) {
                         baseOptions = configuration.baseOptions;
@@ -1462,17 +1591,17 @@ var ProfileRuleApiFp = function (configuration) {
          * @summary Request a Rule assigned to a Profile
          * @param {any} securityGuideId
          * @param {any} profileId
-         * @param {any} id
+         * @param {any} ruleId UUID or ref_id
          * @param {any} [xRHIDENTITY] For internal use only
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        profileRule: function (securityGuideId, profileId, id, xRHIDENTITY, options) {
+        profileRule: function (securityGuideId, profileId, ruleId, xRHIDENTITY, options) {
             return tslib_1.__awaiter(this, void 0, void 0, function () {
                 var localVarAxiosArgs;
                 return tslib_1.__generator(this, function (_a) {
                     switch (_a.label) {
-                        case 0: return [4 /*yield*/, localVarAxiosParamCreator.profileRule(securityGuideId, profileId, id, xRHIDENTITY, options)];
+                        case 0: return [4 /*yield*/, localVarAxiosParamCreator.profileRule(securityGuideId, profileId, ruleId, xRHIDENTITY, options)];
                         case 1:
                             localVarAxiosArgs = _a.sent();
                             return [2 /*return*/, (0, common_1.createRequestFunction)(localVarAxiosArgs, axios_1.default, base_1.BASE_PATH, configuration)];
@@ -1498,7 +1627,7 @@ var ProfileRuleApiFactory = function (configuration, basePath, axios) {
          * @throws {RequiredError}
          */
         profileRule: function (requestParameters, options) {
-            return localVarFp.profileRule(requestParameters.securityGuideId, requestParameters.profileId, requestParameters.id, requestParameters.xRHIDENTITY, options).then(function (request) { return request(axios, basePath); });
+            return localVarFp.profileRule(requestParameters.securityGuideId, requestParameters.profileId, requestParameters.ruleId, requestParameters.xRHIDENTITY, options).then(function (request) { return request(axios, basePath); });
         },
     };
 };
@@ -1524,7 +1653,7 @@ var ProfileRuleApi = /** @class */ (function (_super) {
      */
     ProfileRuleApi.prototype.profileRule = function (requestParameters, options) {
         var _this = this;
-        return (0, exports.ProfileRuleApiFp)(this.configuration).profileRule(requestParameters.securityGuideId, requestParameters.profileId, requestParameters.id, requestParameters.xRHIDENTITY, options).then(function (request) { return request(_this.axios, _this.basePath); });
+        return (0, exports.ProfileRuleApiFp)(this.configuration).profileRule(requestParameters.securityGuideId, requestParameters.profileId, requestParameters.ruleId, requestParameters.xRHIDENTITY, options).then(function (request) { return request(_this.axios, _this.basePath); });
     };
     return ProfileRuleApi;
 }(base_1.BaseAPI));
@@ -1836,20 +1965,20 @@ var ReportApiAxiosParamCreator = function (configuration) {
         /**
          * Returns a Report
          * @summary Request a Report
-         * @param {any} id
+         * @param {any} reportId
          * @param {any} [xRHIDENTITY] For internal use only
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        report: function (id, xRHIDENTITY, options) {
+        report: function (reportId, xRHIDENTITY, options) {
             if (options === void 0) { options = {}; }
             return tslib_1.__awaiter(_this, void 0, void 0, function () {
                 var localVarPath, localVarUrlObj, baseOptions, localVarRequestOptions, localVarHeaderParameter, localVarQueryParameter, headersFromBaseOptions;
                 return tslib_1.__generator(this, function (_a) {
-                    // verify required parameter 'id' is not null or undefined
-                    (0, common_1.assertParamExists)('report', 'id', id);
-                    localVarPath = "/reports/{id}"
-                        .replace("{".concat("id", "}"), encodeURIComponent(String(id)));
+                    // verify required parameter 'reportId' is not null or undefined
+                    (0, common_1.assertParamExists)('report', 'reportId', reportId);
+                    localVarPath = "/reports/{report_id}"
+                        .replace("{".concat("report_id", "}"), encodeURIComponent(String(reportId)));
                     localVarUrlObj = new URL(localVarPath, common_1.DUMMY_BASE_URL);
                     if (configuration) {
                         baseOptions = configuration.baseOptions;
@@ -1885,17 +2014,17 @@ var ReportApiFp = function (configuration) {
         /**
          * Returns a Report
          * @summary Request a Report
-         * @param {any} id
+         * @param {any} reportId
          * @param {any} [xRHIDENTITY] For internal use only
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        report: function (id, xRHIDENTITY, options) {
+        report: function (reportId, xRHIDENTITY, options) {
             return tslib_1.__awaiter(this, void 0, void 0, function () {
                 var localVarAxiosArgs;
                 return tslib_1.__generator(this, function (_a) {
                     switch (_a.label) {
-                        case 0: return [4 /*yield*/, localVarAxiosParamCreator.report(id, xRHIDENTITY, options)];
+                        case 0: return [4 /*yield*/, localVarAxiosParamCreator.report(reportId, xRHIDENTITY, options)];
                         case 1:
                             localVarAxiosArgs = _a.sent();
                             return [2 /*return*/, (0, common_1.createRequestFunction)(localVarAxiosArgs, axios_1.default, base_1.BASE_PATH, configuration)];
@@ -1921,7 +2050,7 @@ var ReportApiFactory = function (configuration, basePath, axios) {
          * @throws {RequiredError}
          */
         report: function (requestParameters, options) {
-            return localVarFp.report(requestParameters.id, requestParameters.xRHIDENTITY, options).then(function (request) { return request(axios, basePath); });
+            return localVarFp.report(requestParameters.reportId, requestParameters.xRHIDENTITY, options).then(function (request) { return request(axios, basePath); });
         },
     };
 };
@@ -1947,11 +2076,565 @@ var ReportApi = /** @class */ (function (_super) {
      */
     ReportApi.prototype.report = function (requestParameters, options) {
         var _this = this;
-        return (0, exports.ReportApiFp)(this.configuration).report(requestParameters.id, requestParameters.xRHIDENTITY, options).then(function (request) { return request(_this.axios, _this.basePath); });
+        return (0, exports.ReportApiFp)(this.configuration).report(requestParameters.reportId, requestParameters.xRHIDENTITY, options).then(function (request) { return request(_this.axios, _this.basePath); });
     };
     return ReportApi;
 }(base_1.BaseAPI));
 exports.ReportApi = ReportApi;
+/**
+ * ReportSystemApi - axios parameter creator
+ * @export
+ */
+var ReportSystemApiAxiosParamCreator = function (configuration) {
+    var _this = this;
+    return {
+        /**
+         * Returns a System under a Report
+         * @summary Request a System
+         * @param {any} systemId
+         * @param {any} reportId
+         * @param {any} [xRHIDENTITY] For internal use only
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        reportSystem: function (systemId, reportId, xRHIDENTITY, options) {
+            if (options === void 0) { options = {}; }
+            return tslib_1.__awaiter(_this, void 0, void 0, function () {
+                var localVarPath, localVarUrlObj, baseOptions, localVarRequestOptions, localVarHeaderParameter, localVarQueryParameter, headersFromBaseOptions;
+                return tslib_1.__generator(this, function (_a) {
+                    // verify required parameter 'systemId' is not null or undefined
+                    (0, common_1.assertParamExists)('reportSystem', 'systemId', systemId);
+                    // verify required parameter 'reportId' is not null or undefined
+                    (0, common_1.assertParamExists)('reportSystem', 'reportId', reportId);
+                    localVarPath = "/reports/{report_id}/systems/{system_id}"
+                        .replace("{".concat("system_id", "}"), encodeURIComponent(String(systemId)))
+                        .replace("{".concat("report_id", "}"), encodeURIComponent(String(reportId)));
+                    localVarUrlObj = new URL(localVarPath, common_1.DUMMY_BASE_URL);
+                    if (configuration) {
+                        baseOptions = configuration.baseOptions;
+                    }
+                    localVarRequestOptions = tslib_1.__assign(tslib_1.__assign({ method: 'GET' }, baseOptions), options);
+                    localVarHeaderParameter = {};
+                    localVarQueryParameter = {};
+                    if (xRHIDENTITY != null) {
+                        localVarHeaderParameter['X-RH-IDENTITY'] = typeof xRHIDENTITY === 'string'
+                            ? xRHIDENTITY
+                            : JSON.stringify(xRHIDENTITY);
+                    }
+                    (0, common_1.setSearchParams)(localVarUrlObj, localVarQueryParameter);
+                    headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+                    localVarRequestOptions.headers = tslib_1.__assign(tslib_1.__assign(tslib_1.__assign({}, localVarHeaderParameter), headersFromBaseOptions), options.headers);
+                    return [2 /*return*/, {
+                            url: (0, common_1.toPathString)(localVarUrlObj),
+                            options: localVarRequestOptions,
+                        }];
+                });
+            });
+        },
+    };
+};
+exports.ReportSystemApiAxiosParamCreator = ReportSystemApiAxiosParamCreator;
+/**
+ * ReportSystemApi - functional programming interface
+ * @export
+ */
+var ReportSystemApiFp = function (configuration) {
+    var localVarAxiosParamCreator = (0, exports.ReportSystemApiAxiosParamCreator)(configuration);
+    return {
+        /**
+         * Returns a System under a Report
+         * @summary Request a System
+         * @param {any} systemId
+         * @param {any} reportId
+         * @param {any} [xRHIDENTITY] For internal use only
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        reportSystem: function (systemId, reportId, xRHIDENTITY, options) {
+            return tslib_1.__awaiter(this, void 0, void 0, function () {
+                var localVarAxiosArgs;
+                return tslib_1.__generator(this, function (_a) {
+                    switch (_a.label) {
+                        case 0: return [4 /*yield*/, localVarAxiosParamCreator.reportSystem(systemId, reportId, xRHIDENTITY, options)];
+                        case 1:
+                            localVarAxiosArgs = _a.sent();
+                            return [2 /*return*/, (0, common_1.createRequestFunction)(localVarAxiosArgs, axios_1.default, base_1.BASE_PATH, configuration)];
+                    }
+                });
+            });
+        },
+    };
+};
+exports.ReportSystemApiFp = ReportSystemApiFp;
+/**
+ * ReportSystemApi - factory interface
+ * @export
+ */
+var ReportSystemApiFactory = function (configuration, basePath, axios) {
+    var localVarFp = (0, exports.ReportSystemApiFp)(configuration);
+    return {
+        /**
+         * Returns a System under a Report
+         * @summary Request a System
+         * @param {ReportSystemApiReportSystemRequest} requestParameters Request parameters.
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        reportSystem: function (requestParameters, options) {
+            return localVarFp.reportSystem(requestParameters.systemId, requestParameters.reportId, requestParameters.xRHIDENTITY, options).then(function (request) { return request(axios, basePath); });
+        },
+    };
+};
+exports.ReportSystemApiFactory = ReportSystemApiFactory;
+/**
+ * ReportSystemApi - object-oriented interface
+ * @export
+ * @class ReportSystemApi
+ * @extends {BaseAPI}
+ */
+var ReportSystemApi = /** @class */ (function (_super) {
+    tslib_1.__extends(ReportSystemApi, _super);
+    function ReportSystemApi() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    /**
+     * Returns a System under a Report
+     * @summary Request a System
+     * @param {ReportSystemApiReportSystemRequest} requestParameters Request parameters.
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof ReportSystemApi
+     */
+    ReportSystemApi.prototype.reportSystem = function (requestParameters, options) {
+        var _this = this;
+        return (0, exports.ReportSystemApiFp)(this.configuration).reportSystem(requestParameters.systemId, requestParameters.reportId, requestParameters.xRHIDENTITY, options).then(function (request) { return request(_this.axios, _this.basePath); });
+    };
+    return ReportSystemApi;
+}(base_1.BaseAPI));
+exports.ReportSystemApi = ReportSystemApi;
+/**
+ * ReportSystemsApi - axios parameter creator
+ * @export
+ */
+var ReportSystemsApiAxiosParamCreator = function (configuration) {
+    var _this = this;
+    return {
+        /**
+         * Lists Systems assigned to a Report
+         * @summary Request Systems assigned to a Report
+         * @param {any} reportId
+         * @param {any} [xRHIDENTITY] For internal use only
+         * @param {any} [limit] Number of items to return per page
+         * @param {any} [offset] Offset of first item of paginated response
+         * @param {any} [sortBy] Attribute and direction to sort the items by. Represented by an array of fields with an optional direction (`<key>:asc` or `<key>:desc`).<br><br>If no direction is selected, `<key>:asc` is used by default.
+         * @param {any} [filter] Query string to filter items by their attributes. Compliant with <a href=\"https://github.com/wvanbergen/scoped_search/wiki/Query-language\" target=\"_blank\" title=\"github.com/wvanbergen/scoped_search\">scoped_search query language</a>. However, only `=` or `!=` (resp. `<>`) operators are supported.<br><br>Systems are searchable using attributes `display_name`, `os_major_version`, `os_minor_version`, `assigned_or_scanned`, and `never_reported`<br><br>(e.g.: `(field_1=something AND field_2!=\"something else\") OR field_3>40`)
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        reportSystems: function (reportId, xRHIDENTITY, limit, offset, sortBy, filter, options) {
+            if (options === void 0) { options = {}; }
+            return tslib_1.__awaiter(_this, void 0, void 0, function () {
+                var localVarPath, localVarUrlObj, baseOptions, localVarRequestOptions, localVarHeaderParameter, localVarQueryParameter, headersFromBaseOptions;
+                return tslib_1.__generator(this, function (_a) {
+                    // verify required parameter 'reportId' is not null or undefined
+                    (0, common_1.assertParamExists)('reportSystems', 'reportId', reportId);
+                    localVarPath = "/reports/{report_id}/systems"
+                        .replace("{".concat("report_id", "}"), encodeURIComponent(String(reportId)));
+                    localVarUrlObj = new URL(localVarPath, common_1.DUMMY_BASE_URL);
+                    if (configuration) {
+                        baseOptions = configuration.baseOptions;
+                    }
+                    localVarRequestOptions = tslib_1.__assign(tslib_1.__assign({ method: 'GET' }, baseOptions), options);
+                    localVarHeaderParameter = {};
+                    localVarQueryParameter = {};
+                    if (limit !== undefined) {
+                        localVarQueryParameter['limit'] = limit;
+                    }
+                    if (offset !== undefined) {
+                        localVarQueryParameter['offset'] = offset;
+                    }
+                    if (sortBy !== undefined) {
+                        localVarQueryParameter['sort_by'] = sortBy;
+                    }
+                    if (filter !== undefined) {
+                        localVarQueryParameter['filter'] = filter;
+                    }
+                    if (xRHIDENTITY != null) {
+                        localVarHeaderParameter['X-RH-IDENTITY'] = typeof xRHIDENTITY === 'string'
+                            ? xRHIDENTITY
+                            : JSON.stringify(xRHIDENTITY);
+                    }
+                    (0, common_1.setSearchParams)(localVarUrlObj, localVarQueryParameter);
+                    headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+                    localVarRequestOptions.headers = tslib_1.__assign(tslib_1.__assign(tslib_1.__assign({}, localVarHeaderParameter), headersFromBaseOptions), options.headers);
+                    return [2 /*return*/, {
+                            url: (0, common_1.toPathString)(localVarUrlObj),
+                            options: localVarRequestOptions,
+                        }];
+                });
+            });
+        },
+    };
+};
+exports.ReportSystemsApiAxiosParamCreator = ReportSystemsApiAxiosParamCreator;
+/**
+ * ReportSystemsApi - functional programming interface
+ * @export
+ */
+var ReportSystemsApiFp = function (configuration) {
+    var localVarAxiosParamCreator = (0, exports.ReportSystemsApiAxiosParamCreator)(configuration);
+    return {
+        /**
+         * Lists Systems assigned to a Report
+         * @summary Request Systems assigned to a Report
+         * @param {any} reportId
+         * @param {any} [xRHIDENTITY] For internal use only
+         * @param {any} [limit] Number of items to return per page
+         * @param {any} [offset] Offset of first item of paginated response
+         * @param {any} [sortBy] Attribute and direction to sort the items by. Represented by an array of fields with an optional direction (`<key>:asc` or `<key>:desc`).<br><br>If no direction is selected, `<key>:asc` is used by default.
+         * @param {any} [filter] Query string to filter items by their attributes. Compliant with <a href=\"https://github.com/wvanbergen/scoped_search/wiki/Query-language\" target=\"_blank\" title=\"github.com/wvanbergen/scoped_search\">scoped_search query language</a>. However, only `=` or `!=` (resp. `<>`) operators are supported.<br><br>Systems are searchable using attributes `display_name`, `os_major_version`, `os_minor_version`, `assigned_or_scanned`, and `never_reported`<br><br>(e.g.: `(field_1=something AND field_2!=\"something else\") OR field_3>40`)
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        reportSystems: function (reportId, xRHIDENTITY, limit, offset, sortBy, filter, options) {
+            return tslib_1.__awaiter(this, void 0, void 0, function () {
+                var localVarAxiosArgs;
+                return tslib_1.__generator(this, function (_a) {
+                    switch (_a.label) {
+                        case 0: return [4 /*yield*/, localVarAxiosParamCreator.reportSystems(reportId, xRHIDENTITY, limit, offset, sortBy, filter, options)];
+                        case 1:
+                            localVarAxiosArgs = _a.sent();
+                            return [2 /*return*/, (0, common_1.createRequestFunction)(localVarAxiosArgs, axios_1.default, base_1.BASE_PATH, configuration)];
+                    }
+                });
+            });
+        },
+    };
+};
+exports.ReportSystemsApiFp = ReportSystemsApiFp;
+/**
+ * ReportSystemsApi - factory interface
+ * @export
+ */
+var ReportSystemsApiFactory = function (configuration, basePath, axios) {
+    var localVarFp = (0, exports.ReportSystemsApiFp)(configuration);
+    return {
+        /**
+         * Lists Systems assigned to a Report
+         * @summary Request Systems assigned to a Report
+         * @param {ReportSystemsApiReportSystemsRequest} requestParameters Request parameters.
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        reportSystems: function (requestParameters, options) {
+            return localVarFp.reportSystems(requestParameters.reportId, requestParameters.xRHIDENTITY, requestParameters.limit, requestParameters.offset, requestParameters.sortBy, requestParameters.filter, options).then(function (request) { return request(axios, basePath); });
+        },
+    };
+};
+exports.ReportSystemsApiFactory = ReportSystemsApiFactory;
+/**
+ * ReportSystemsApi - object-oriented interface
+ * @export
+ * @class ReportSystemsApi
+ * @extends {BaseAPI}
+ */
+var ReportSystemsApi = /** @class */ (function (_super) {
+    tslib_1.__extends(ReportSystemsApi, _super);
+    function ReportSystemsApi() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    /**
+     * Lists Systems assigned to a Report
+     * @summary Request Systems assigned to a Report
+     * @param {ReportSystemsApiReportSystemsRequest} requestParameters Request parameters.
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof ReportSystemsApi
+     */
+    ReportSystemsApi.prototype.reportSystems = function (requestParameters, options) {
+        var _this = this;
+        return (0, exports.ReportSystemsApiFp)(this.configuration).reportSystems(requestParameters.reportId, requestParameters.xRHIDENTITY, requestParameters.limit, requestParameters.offset, requestParameters.sortBy, requestParameters.filter, options).then(function (request) { return request(_this.axios, _this.basePath); });
+    };
+    return ReportSystemsApi;
+}(base_1.BaseAPI));
+exports.ReportSystemsApi = ReportSystemsApi;
+/**
+ * ReportTestResultApi - axios parameter creator
+ * @export
+ */
+var ReportTestResultApiAxiosParamCreator = function (configuration) {
+    var _this = this;
+    return {
+        /**
+         * Returns a Test Result under a Report
+         * @summary Request a Test Result
+         * @param {any} testResultId
+         * @param {any} reportId
+         * @param {any} [xRHIDENTITY] For internal use only
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        reportTestResult: function (testResultId, reportId, xRHIDENTITY, options) {
+            if (options === void 0) { options = {}; }
+            return tslib_1.__awaiter(_this, void 0, void 0, function () {
+                var localVarPath, localVarUrlObj, baseOptions, localVarRequestOptions, localVarHeaderParameter, localVarQueryParameter, headersFromBaseOptions;
+                return tslib_1.__generator(this, function (_a) {
+                    // verify required parameter 'testResultId' is not null or undefined
+                    (0, common_1.assertParamExists)('reportTestResult', 'testResultId', testResultId);
+                    // verify required parameter 'reportId' is not null or undefined
+                    (0, common_1.assertParamExists)('reportTestResult', 'reportId', reportId);
+                    localVarPath = "/reports/{report_id}/test_results/{test_result_id}"
+                        .replace("{".concat("test_result_id", "}"), encodeURIComponent(String(testResultId)))
+                        .replace("{".concat("report_id", "}"), encodeURIComponent(String(reportId)));
+                    localVarUrlObj = new URL(localVarPath, common_1.DUMMY_BASE_URL);
+                    if (configuration) {
+                        baseOptions = configuration.baseOptions;
+                    }
+                    localVarRequestOptions = tslib_1.__assign(tslib_1.__assign({ method: 'GET' }, baseOptions), options);
+                    localVarHeaderParameter = {};
+                    localVarQueryParameter = {};
+                    if (xRHIDENTITY != null) {
+                        localVarHeaderParameter['X-RH-IDENTITY'] = typeof xRHIDENTITY === 'string'
+                            ? xRHIDENTITY
+                            : JSON.stringify(xRHIDENTITY);
+                    }
+                    (0, common_1.setSearchParams)(localVarUrlObj, localVarQueryParameter);
+                    headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+                    localVarRequestOptions.headers = tslib_1.__assign(tslib_1.__assign(tslib_1.__assign({}, localVarHeaderParameter), headersFromBaseOptions), options.headers);
+                    return [2 /*return*/, {
+                            url: (0, common_1.toPathString)(localVarUrlObj),
+                            options: localVarRequestOptions,
+                        }];
+                });
+            });
+        },
+    };
+};
+exports.ReportTestResultApiAxiosParamCreator = ReportTestResultApiAxiosParamCreator;
+/**
+ * ReportTestResultApi - functional programming interface
+ * @export
+ */
+var ReportTestResultApiFp = function (configuration) {
+    var localVarAxiosParamCreator = (0, exports.ReportTestResultApiAxiosParamCreator)(configuration);
+    return {
+        /**
+         * Returns a Test Result under a Report
+         * @summary Request a Test Result
+         * @param {any} testResultId
+         * @param {any} reportId
+         * @param {any} [xRHIDENTITY] For internal use only
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        reportTestResult: function (testResultId, reportId, xRHIDENTITY, options) {
+            return tslib_1.__awaiter(this, void 0, void 0, function () {
+                var localVarAxiosArgs;
+                return tslib_1.__generator(this, function (_a) {
+                    switch (_a.label) {
+                        case 0: return [4 /*yield*/, localVarAxiosParamCreator.reportTestResult(testResultId, reportId, xRHIDENTITY, options)];
+                        case 1:
+                            localVarAxiosArgs = _a.sent();
+                            return [2 /*return*/, (0, common_1.createRequestFunction)(localVarAxiosArgs, axios_1.default, base_1.BASE_PATH, configuration)];
+                    }
+                });
+            });
+        },
+    };
+};
+exports.ReportTestResultApiFp = ReportTestResultApiFp;
+/**
+ * ReportTestResultApi - factory interface
+ * @export
+ */
+var ReportTestResultApiFactory = function (configuration, basePath, axios) {
+    var localVarFp = (0, exports.ReportTestResultApiFp)(configuration);
+    return {
+        /**
+         * Returns a Test Result under a Report
+         * @summary Request a Test Result
+         * @param {ReportTestResultApiReportTestResultRequest} requestParameters Request parameters.
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        reportTestResult: function (requestParameters, options) {
+            return localVarFp.reportTestResult(requestParameters.testResultId, requestParameters.reportId, requestParameters.xRHIDENTITY, options).then(function (request) { return request(axios, basePath); });
+        },
+    };
+};
+exports.ReportTestResultApiFactory = ReportTestResultApiFactory;
+/**
+ * ReportTestResultApi - object-oriented interface
+ * @export
+ * @class ReportTestResultApi
+ * @extends {BaseAPI}
+ */
+var ReportTestResultApi = /** @class */ (function (_super) {
+    tslib_1.__extends(ReportTestResultApi, _super);
+    function ReportTestResultApi() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    /**
+     * Returns a Test Result under a Report
+     * @summary Request a Test Result
+     * @param {ReportTestResultApiReportTestResultRequest} requestParameters Request parameters.
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof ReportTestResultApi
+     */
+    ReportTestResultApi.prototype.reportTestResult = function (requestParameters, options) {
+        var _this = this;
+        return (0, exports.ReportTestResultApiFp)(this.configuration).reportTestResult(requestParameters.testResultId, requestParameters.reportId, requestParameters.xRHIDENTITY, options).then(function (request) { return request(_this.axios, _this.basePath); });
+    };
+    return ReportTestResultApi;
+}(base_1.BaseAPI));
+exports.ReportTestResultApi = ReportTestResultApi;
+/**
+ * ReportTestResultsApi - axios parameter creator
+ * @export
+ */
+var ReportTestResultsApiAxiosParamCreator = function (configuration) {
+    var _this = this;
+    return {
+        /**
+         * Lists Test Results under a Report
+         * @summary Request Test Results under a Report
+         * @param {any} reportId
+         * @param {any} [xRHIDENTITY] For internal use only
+         * @param {any} [limit] Number of items to return per page
+         * @param {any} [offset] Offset of first item of paginated response
+         * @param {any} [sortBy] Attribute and direction to sort the items by. Represented by an array of fields with an optional direction (`<key>:asc` or `<key>:desc`).<br><br>If no direction is selected, `<key>:asc` is used by default.
+         * @param {any} [filter] Query string to filter items by their attributes. Compliant with <a href=\"https://github.com/wvanbergen/scoped_search/wiki/Query-language\" target=\"_blank\" title=\"github.com/wvanbergen/scoped_search\">scoped_search query language</a>. However, only `=` or `!=` (resp. `<>`) operators are supported.<br><br>Test Results are searchable using attributes `score`, `supported`, `display_name`, `os_minor_version`, `security_guide_version`, and `compliant`<br><br>(e.g.: `(field_1=something AND field_2!=\"something else\") OR field_3>40`)
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        reportTestResults: function (reportId, xRHIDENTITY, limit, offset, sortBy, filter, options) {
+            if (options === void 0) { options = {}; }
+            return tslib_1.__awaiter(_this, void 0, void 0, function () {
+                var localVarPath, localVarUrlObj, baseOptions, localVarRequestOptions, localVarHeaderParameter, localVarQueryParameter, headersFromBaseOptions;
+                return tslib_1.__generator(this, function (_a) {
+                    // verify required parameter 'reportId' is not null or undefined
+                    (0, common_1.assertParamExists)('reportTestResults', 'reportId', reportId);
+                    localVarPath = "/reports/{report_id}/test_results"
+                        .replace("{".concat("report_id", "}"), encodeURIComponent(String(reportId)));
+                    localVarUrlObj = new URL(localVarPath, common_1.DUMMY_BASE_URL);
+                    if (configuration) {
+                        baseOptions = configuration.baseOptions;
+                    }
+                    localVarRequestOptions = tslib_1.__assign(tslib_1.__assign({ method: 'GET' }, baseOptions), options);
+                    localVarHeaderParameter = {};
+                    localVarQueryParameter = {};
+                    if (limit !== undefined) {
+                        localVarQueryParameter['limit'] = limit;
+                    }
+                    if (offset !== undefined) {
+                        localVarQueryParameter['offset'] = offset;
+                    }
+                    if (sortBy !== undefined) {
+                        localVarQueryParameter['sort_by'] = sortBy;
+                    }
+                    if (filter !== undefined) {
+                        localVarQueryParameter['filter'] = filter;
+                    }
+                    if (xRHIDENTITY != null) {
+                        localVarHeaderParameter['X-RH-IDENTITY'] = typeof xRHIDENTITY === 'string'
+                            ? xRHIDENTITY
+                            : JSON.stringify(xRHIDENTITY);
+                    }
+                    (0, common_1.setSearchParams)(localVarUrlObj, localVarQueryParameter);
+                    headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+                    localVarRequestOptions.headers = tslib_1.__assign(tslib_1.__assign(tslib_1.__assign({}, localVarHeaderParameter), headersFromBaseOptions), options.headers);
+                    return [2 /*return*/, {
+                            url: (0, common_1.toPathString)(localVarUrlObj),
+                            options: localVarRequestOptions,
+                        }];
+                });
+            });
+        },
+    };
+};
+exports.ReportTestResultsApiAxiosParamCreator = ReportTestResultsApiAxiosParamCreator;
+/**
+ * ReportTestResultsApi - functional programming interface
+ * @export
+ */
+var ReportTestResultsApiFp = function (configuration) {
+    var localVarAxiosParamCreator = (0, exports.ReportTestResultsApiAxiosParamCreator)(configuration);
+    return {
+        /**
+         * Lists Test Results under a Report
+         * @summary Request Test Results under a Report
+         * @param {any} reportId
+         * @param {any} [xRHIDENTITY] For internal use only
+         * @param {any} [limit] Number of items to return per page
+         * @param {any} [offset] Offset of first item of paginated response
+         * @param {any} [sortBy] Attribute and direction to sort the items by. Represented by an array of fields with an optional direction (`<key>:asc` or `<key>:desc`).<br><br>If no direction is selected, `<key>:asc` is used by default.
+         * @param {any} [filter] Query string to filter items by their attributes. Compliant with <a href=\"https://github.com/wvanbergen/scoped_search/wiki/Query-language\" target=\"_blank\" title=\"github.com/wvanbergen/scoped_search\">scoped_search query language</a>. However, only `=` or `!=` (resp. `<>`) operators are supported.<br><br>Test Results are searchable using attributes `score`, `supported`, `display_name`, `os_minor_version`, `security_guide_version`, and `compliant`<br><br>(e.g.: `(field_1=something AND field_2!=\"something else\") OR field_3>40`)
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        reportTestResults: function (reportId, xRHIDENTITY, limit, offset, sortBy, filter, options) {
+            return tslib_1.__awaiter(this, void 0, void 0, function () {
+                var localVarAxiosArgs;
+                return tslib_1.__generator(this, function (_a) {
+                    switch (_a.label) {
+                        case 0: return [4 /*yield*/, localVarAxiosParamCreator.reportTestResults(reportId, xRHIDENTITY, limit, offset, sortBy, filter, options)];
+                        case 1:
+                            localVarAxiosArgs = _a.sent();
+                            return [2 /*return*/, (0, common_1.createRequestFunction)(localVarAxiosArgs, axios_1.default, base_1.BASE_PATH, configuration)];
+                    }
+                });
+            });
+        },
+    };
+};
+exports.ReportTestResultsApiFp = ReportTestResultsApiFp;
+/**
+ * ReportTestResultsApi - factory interface
+ * @export
+ */
+var ReportTestResultsApiFactory = function (configuration, basePath, axios) {
+    var localVarFp = (0, exports.ReportTestResultsApiFp)(configuration);
+    return {
+        /**
+         * Lists Test Results under a Report
+         * @summary Request Test Results under a Report
+         * @param {ReportTestResultsApiReportTestResultsRequest} requestParameters Request parameters.
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        reportTestResults: function (requestParameters, options) {
+            return localVarFp.reportTestResults(requestParameters.reportId, requestParameters.xRHIDENTITY, requestParameters.limit, requestParameters.offset, requestParameters.sortBy, requestParameters.filter, options).then(function (request) { return request(axios, basePath); });
+        },
+    };
+};
+exports.ReportTestResultsApiFactory = ReportTestResultsApiFactory;
+/**
+ * ReportTestResultsApi - object-oriented interface
+ * @export
+ * @class ReportTestResultsApi
+ * @extends {BaseAPI}
+ */
+var ReportTestResultsApi = /** @class */ (function (_super) {
+    tslib_1.__extends(ReportTestResultsApi, _super);
+    function ReportTestResultsApi() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    /**
+     * Lists Test Results under a Report
+     * @summary Request Test Results under a Report
+     * @param {ReportTestResultsApiReportTestResultsRequest} requestParameters Request parameters.
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof ReportTestResultsApi
+     */
+    ReportTestResultsApi.prototype.reportTestResults = function (requestParameters, options) {
+        var _this = this;
+        return (0, exports.ReportTestResultsApiFp)(this.configuration).reportTestResults(requestParameters.reportId, requestParameters.xRHIDENTITY, requestParameters.limit, requestParameters.offset, requestParameters.sortBy, requestParameters.filter, options).then(function (request) { return request(_this.axios, _this.basePath); });
+    };
+    return ReportTestResultsApi;
+}(base_1.BaseAPI));
+exports.ReportTestResultsApi = ReportTestResultsApi;
 /**
  * ReportsApi - axios parameter creator
  * @export
@@ -1966,7 +2649,7 @@ var ReportsApiAxiosParamCreator = function (configuration) {
          * @param {any} [limit] Number of items to return per page
          * @param {any} [offset] Offset of first item of paginated response
          * @param {any} [sortBy] Attribute and direction to sort the items by. Represented by an array of fields with an optional direction (`<key>:asc` or `<key>:desc`).<br><br>If no direction is selected, `<key>:asc` is used by default.
-         * @param {any} [filter] Query string to filter items by their attributes. Compliant with <a href=\"https://github.com/wvanbergen/scoped_search/wiki/Query-language\" target=\"_blank\" title=\"github.com/wvanbergen/scoped_search\">scoped_search query language</a>. However, only `=` or `!=` (resp. `<>`) operators are supported.<br><br>Reports are searchable using attributes `title` and `os_major_version`<br><br>(e.g.: `(field_1=something AND field_2!=\"something else\") OR field_3>40`)
+         * @param {any} [filter] Query string to filter items by their attributes. Compliant with <a href=\"https://github.com/wvanbergen/scoped_search/wiki/Query-language\" target=\"_blank\" title=\"github.com/wvanbergen/scoped_search\">scoped_search query language</a>. However, only `=` or `!=` (resp. `<>`) operators are supported.<br><br>Reports are searchable using attributes `title`, `os_major_version`, and `with_reported_systems`<br><br>(e.g.: `(field_1=something AND field_2!=\"something else\") OR field_3>40`)
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
@@ -2027,7 +2710,7 @@ var ReportsApiFp = function (configuration) {
          * @param {any} [limit] Number of items to return per page
          * @param {any} [offset] Offset of first item of paginated response
          * @param {any} [sortBy] Attribute and direction to sort the items by. Represented by an array of fields with an optional direction (`<key>:asc` or `<key>:desc`).<br><br>If no direction is selected, `<key>:asc` is used by default.
-         * @param {any} [filter] Query string to filter items by their attributes. Compliant with <a href=\"https://github.com/wvanbergen/scoped_search/wiki/Query-language\" target=\"_blank\" title=\"github.com/wvanbergen/scoped_search\">scoped_search query language</a>. However, only `=` or `!=` (resp. `<>`) operators are supported.<br><br>Reports are searchable using attributes `title` and `os_major_version`<br><br>(e.g.: `(field_1=something AND field_2!=\"something else\") OR field_3>40`)
+         * @param {any} [filter] Query string to filter items by their attributes. Compliant with <a href=\"https://github.com/wvanbergen/scoped_search/wiki/Query-language\" target=\"_blank\" title=\"github.com/wvanbergen/scoped_search\">scoped_search query language</a>. However, only `=` or `!=` (resp. `<>`) operators are supported.<br><br>Reports are searchable using attributes `title`, `os_major_version`, and `with_reported_systems`<br><br>(e.g.: `(field_1=something AND field_2!=\"something else\") OR field_3>40`)
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
@@ -2106,23 +2789,23 @@ var RuleApiAxiosParamCreator = function (configuration) {
          * Returns a Rule
          * @summary Request a Rule
          * @param {any} securityGuideId
-         * @param {any} id
+         * @param {any} ruleId UUID or ref_id
          * @param {any} [xRHIDENTITY] For internal use only
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        rule: function (securityGuideId, id, xRHIDENTITY, options) {
+        rule: function (securityGuideId, ruleId, xRHIDENTITY, options) {
             if (options === void 0) { options = {}; }
             return tslib_1.__awaiter(_this, void 0, void 0, function () {
                 var localVarPath, localVarUrlObj, baseOptions, localVarRequestOptions, localVarHeaderParameter, localVarQueryParameter, headersFromBaseOptions;
                 return tslib_1.__generator(this, function (_a) {
                     // verify required parameter 'securityGuideId' is not null or undefined
                     (0, common_1.assertParamExists)('rule', 'securityGuideId', securityGuideId);
-                    // verify required parameter 'id' is not null or undefined
-                    (0, common_1.assertParamExists)('rule', 'id', id);
-                    localVarPath = "/security_guides/{security_guide_id}/rules/{id}"
+                    // verify required parameter 'ruleId' is not null or undefined
+                    (0, common_1.assertParamExists)('rule', 'ruleId', ruleId);
+                    localVarPath = "/security_guides/{security_guide_id}/rules/{rule_id}"
                         .replace("{".concat("security_guide_id", "}"), encodeURIComponent(String(securityGuideId)))
-                        .replace("{".concat("id", "}"), encodeURIComponent(String(id)));
+                        .replace("{".concat("rule_id", "}"), encodeURIComponent(String(ruleId)));
                     localVarUrlObj = new URL(localVarPath, common_1.DUMMY_BASE_URL);
                     if (configuration) {
                         baseOptions = configuration.baseOptions;
@@ -2159,17 +2842,17 @@ var RuleApiFp = function (configuration) {
          * Returns a Rule
          * @summary Request a Rule
          * @param {any} securityGuideId
-         * @param {any} id
+         * @param {any} ruleId UUID or ref_id
          * @param {any} [xRHIDENTITY] For internal use only
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        rule: function (securityGuideId, id, xRHIDENTITY, options) {
+        rule: function (securityGuideId, ruleId, xRHIDENTITY, options) {
             return tslib_1.__awaiter(this, void 0, void 0, function () {
                 var localVarAxiosArgs;
                 return tslib_1.__generator(this, function (_a) {
                     switch (_a.label) {
-                        case 0: return [4 /*yield*/, localVarAxiosParamCreator.rule(securityGuideId, id, xRHIDENTITY, options)];
+                        case 0: return [4 /*yield*/, localVarAxiosParamCreator.rule(securityGuideId, ruleId, xRHIDENTITY, options)];
                         case 1:
                             localVarAxiosArgs = _a.sent();
                             return [2 /*return*/, (0, common_1.createRequestFunction)(localVarAxiosArgs, axios_1.default, base_1.BASE_PATH, configuration)];
@@ -2195,7 +2878,7 @@ var RuleApiFactory = function (configuration, basePath, axios) {
          * @throws {RequiredError}
          */
         rule: function (requestParameters, options) {
-            return localVarFp.rule(requestParameters.securityGuideId, requestParameters.id, requestParameters.xRHIDENTITY, options).then(function (request) { return request(axios, basePath); });
+            return localVarFp.rule(requestParameters.securityGuideId, requestParameters.ruleId, requestParameters.xRHIDENTITY, options).then(function (request) { return request(axios, basePath); });
         },
     };
 };
@@ -2221,7 +2904,7 @@ var RuleApi = /** @class */ (function (_super) {
      */
     RuleApi.prototype.rule = function (requestParameters, options) {
         var _this = this;
-        return (0, exports.RuleApiFp)(this.configuration).rule(requestParameters.securityGuideId, requestParameters.id, requestParameters.xRHIDENTITY, options).then(function (request) { return request(_this.axios, _this.basePath); });
+        return (0, exports.RuleApiFp)(this.configuration).rule(requestParameters.securityGuideId, requestParameters.ruleId, requestParameters.xRHIDENTITY, options).then(function (request) { return request(_this.axios, _this.basePath); });
     };
     return RuleApi;
 }(base_1.BaseAPI));
@@ -2237,23 +2920,23 @@ var RuleGroupApiAxiosParamCreator = function (configuration) {
          * Returns a Rule Group
          * @summary Request a Rule Group
          * @param {any} securityGuideId
-         * @param {any} id
+         * @param {any} ruleGroupId
          * @param {any} [xRHIDENTITY] For internal use only
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        ruleGroup: function (securityGuideId, id, xRHIDENTITY, options) {
+        ruleGroup: function (securityGuideId, ruleGroupId, xRHIDENTITY, options) {
             if (options === void 0) { options = {}; }
             return tslib_1.__awaiter(_this, void 0, void 0, function () {
                 var localVarPath, localVarUrlObj, baseOptions, localVarRequestOptions, localVarHeaderParameter, localVarQueryParameter, headersFromBaseOptions;
                 return tslib_1.__generator(this, function (_a) {
                     // verify required parameter 'securityGuideId' is not null or undefined
                     (0, common_1.assertParamExists)('ruleGroup', 'securityGuideId', securityGuideId);
-                    // verify required parameter 'id' is not null or undefined
-                    (0, common_1.assertParamExists)('ruleGroup', 'id', id);
-                    localVarPath = "/security_guides/{security_guide_id}/rule_groups/{id}"
+                    // verify required parameter 'ruleGroupId' is not null or undefined
+                    (0, common_1.assertParamExists)('ruleGroup', 'ruleGroupId', ruleGroupId);
+                    localVarPath = "/security_guides/{security_guide_id}/rule_groups/{rule_group_id}"
                         .replace("{".concat("security_guide_id", "}"), encodeURIComponent(String(securityGuideId)))
-                        .replace("{".concat("id", "}"), encodeURIComponent(String(id)));
+                        .replace("{".concat("rule_group_id", "}"), encodeURIComponent(String(ruleGroupId)));
                     localVarUrlObj = new URL(localVarPath, common_1.DUMMY_BASE_URL);
                     if (configuration) {
                         baseOptions = configuration.baseOptions;
@@ -2290,17 +2973,17 @@ var RuleGroupApiFp = function (configuration) {
          * Returns a Rule Group
          * @summary Request a Rule Group
          * @param {any} securityGuideId
-         * @param {any} id
+         * @param {any} ruleGroupId
          * @param {any} [xRHIDENTITY] For internal use only
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        ruleGroup: function (securityGuideId, id, xRHIDENTITY, options) {
+        ruleGroup: function (securityGuideId, ruleGroupId, xRHIDENTITY, options) {
             return tslib_1.__awaiter(this, void 0, void 0, function () {
                 var localVarAxiosArgs;
                 return tslib_1.__generator(this, function (_a) {
                     switch (_a.label) {
-                        case 0: return [4 /*yield*/, localVarAxiosParamCreator.ruleGroup(securityGuideId, id, xRHIDENTITY, options)];
+                        case 0: return [4 /*yield*/, localVarAxiosParamCreator.ruleGroup(securityGuideId, ruleGroupId, xRHIDENTITY, options)];
                         case 1:
                             localVarAxiosArgs = _a.sent();
                             return [2 /*return*/, (0, common_1.createRequestFunction)(localVarAxiosArgs, axios_1.default, base_1.BASE_PATH, configuration)];
@@ -2326,7 +3009,7 @@ var RuleGroupApiFactory = function (configuration, basePath, axios) {
          * @throws {RequiredError}
          */
         ruleGroup: function (requestParameters, options) {
-            return localVarFp.ruleGroup(requestParameters.securityGuideId, requestParameters.id, requestParameters.xRHIDENTITY, options).then(function (request) { return request(axios, basePath); });
+            return localVarFp.ruleGroup(requestParameters.securityGuideId, requestParameters.ruleGroupId, requestParameters.xRHIDENTITY, options).then(function (request) { return request(axios, basePath); });
         },
     };
 };
@@ -2352,7 +3035,7 @@ var RuleGroupApi = /** @class */ (function (_super) {
      */
     RuleGroupApi.prototype.ruleGroup = function (requestParameters, options) {
         var _this = this;
-        return (0, exports.RuleGroupApiFp)(this.configuration).ruleGroup(requestParameters.securityGuideId, requestParameters.id, requestParameters.xRHIDENTITY, options).then(function (request) { return request(_this.axios, _this.basePath); });
+        return (0, exports.RuleGroupApiFp)(this.configuration).ruleGroup(requestParameters.securityGuideId, requestParameters.ruleGroupId, requestParameters.xRHIDENTITY, options).then(function (request) { return request(_this.axios, _this.basePath); });
     };
     return RuleGroupApi;
 }(base_1.BaseAPI));
@@ -2659,20 +3342,20 @@ var SecurityGuideApiAxiosParamCreator = function (configuration) {
         /**
          * Returns a Security Guide
          * @summary Request a Security Guide
-         * @param {any} id
+         * @param {any} securityGuideId
          * @param {any} [xRHIDENTITY] For internal use only
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        securityGuide: function (id, xRHIDENTITY, options) {
+        securityGuide: function (securityGuideId, xRHIDENTITY, options) {
             if (options === void 0) { options = {}; }
             return tslib_1.__awaiter(_this, void 0, void 0, function () {
                 var localVarPath, localVarUrlObj, baseOptions, localVarRequestOptions, localVarHeaderParameter, localVarQueryParameter, headersFromBaseOptions;
                 return tslib_1.__generator(this, function (_a) {
-                    // verify required parameter 'id' is not null or undefined
-                    (0, common_1.assertParamExists)('securityGuide', 'id', id);
-                    localVarPath = "/security_guides/{id}"
-                        .replace("{".concat("id", "}"), encodeURIComponent(String(id)));
+                    // verify required parameter 'securityGuideId' is not null or undefined
+                    (0, common_1.assertParamExists)('securityGuide', 'securityGuideId', securityGuideId);
+                    localVarPath = "/security_guides/{security_guide_id}"
+                        .replace("{".concat("security_guide_id", "}"), encodeURIComponent(String(securityGuideId)));
                     localVarUrlObj = new URL(localVarPath, common_1.DUMMY_BASE_URL);
                     if (configuration) {
                         baseOptions = configuration.baseOptions;
@@ -2708,17 +3391,17 @@ var SecurityGuideApiFp = function (configuration) {
         /**
          * Returns a Security Guide
          * @summary Request a Security Guide
-         * @param {any} id
+         * @param {any} securityGuideId
          * @param {any} [xRHIDENTITY] For internal use only
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        securityGuide: function (id, xRHIDENTITY, options) {
+        securityGuide: function (securityGuideId, xRHIDENTITY, options) {
             return tslib_1.__awaiter(this, void 0, void 0, function () {
                 var localVarAxiosArgs;
                 return tslib_1.__generator(this, function (_a) {
                     switch (_a.label) {
-                        case 0: return [4 /*yield*/, localVarAxiosParamCreator.securityGuide(id, xRHIDENTITY, options)];
+                        case 0: return [4 /*yield*/, localVarAxiosParamCreator.securityGuide(securityGuideId, xRHIDENTITY, options)];
                         case 1:
                             localVarAxiosArgs = _a.sent();
                             return [2 /*return*/, (0, common_1.createRequestFunction)(localVarAxiosArgs, axios_1.default, base_1.BASE_PATH, configuration)];
@@ -2744,7 +3427,7 @@ var SecurityGuideApiFactory = function (configuration, basePath, axios) {
          * @throws {RequiredError}
          */
         securityGuide: function (requestParameters, options) {
-            return localVarFp.securityGuide(requestParameters.id, requestParameters.xRHIDENTITY, options).then(function (request) { return request(axios, basePath); });
+            return localVarFp.securityGuide(requestParameters.securityGuideId, requestParameters.xRHIDENTITY, options).then(function (request) { return request(axios, basePath); });
         },
     };
 };
@@ -2770,7 +3453,7 @@ var SecurityGuideApi = /** @class */ (function (_super) {
      */
     SecurityGuideApi.prototype.securityGuide = function (requestParameters, options) {
         var _this = this;
-        return (0, exports.SecurityGuideApiFp)(this.configuration).securityGuide(requestParameters.id, requestParameters.xRHIDENTITY, options).then(function (request) { return request(_this.axios, _this.basePath); });
+        return (0, exports.SecurityGuideApiFp)(this.configuration).securityGuide(requestParameters.securityGuideId, requestParameters.xRHIDENTITY, options).then(function (request) { return request(_this.axios, _this.basePath); });
     };
     return SecurityGuideApi;
 }(base_1.BaseAPI));
@@ -2785,20 +3468,20 @@ var SecurityGuideRuleTreeApiAxiosParamCreator = function (configuration) {
         /**
          * Returns the Rule Tree of a Security Guide
          * @summary Request the Rule Tree of a Security Guide
-         * @param {any} id
+         * @param {any} securityGuideId
          * @param {any} [xRHIDENTITY] For internal use only
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        securityGuideRuleTree: function (id, xRHIDENTITY, options) {
+        securityGuideRuleTree: function (securityGuideId, xRHIDENTITY, options) {
             if (options === void 0) { options = {}; }
             return tslib_1.__awaiter(_this, void 0, void 0, function () {
                 var localVarPath, localVarUrlObj, baseOptions, localVarRequestOptions, localVarHeaderParameter, localVarQueryParameter, headersFromBaseOptions;
                 return tslib_1.__generator(this, function (_a) {
-                    // verify required parameter 'id' is not null or undefined
-                    (0, common_1.assertParamExists)('securityGuideRuleTree', 'id', id);
-                    localVarPath = "/security_guides/{id}/rule_tree"
-                        .replace("{".concat("id", "}"), encodeURIComponent(String(id)));
+                    // verify required parameter 'securityGuideId' is not null or undefined
+                    (0, common_1.assertParamExists)('securityGuideRuleTree', 'securityGuideId', securityGuideId);
+                    localVarPath = "/security_guides/{security_guide_id}/rule_tree"
+                        .replace("{".concat("security_guide_id", "}"), encodeURIComponent(String(securityGuideId)));
                     localVarUrlObj = new URL(localVarPath, common_1.DUMMY_BASE_URL);
                     if (configuration) {
                         baseOptions = configuration.baseOptions;
@@ -2834,17 +3517,17 @@ var SecurityGuideRuleTreeApiFp = function (configuration) {
         /**
          * Returns the Rule Tree of a Security Guide
          * @summary Request the Rule Tree of a Security Guide
-         * @param {any} id
+         * @param {any} securityGuideId
          * @param {any} [xRHIDENTITY] For internal use only
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        securityGuideRuleTree: function (id, xRHIDENTITY, options) {
+        securityGuideRuleTree: function (securityGuideId, xRHIDENTITY, options) {
             return tslib_1.__awaiter(this, void 0, void 0, function () {
                 var localVarAxiosArgs;
                 return tslib_1.__generator(this, function (_a) {
                     switch (_a.label) {
-                        case 0: return [4 /*yield*/, localVarAxiosParamCreator.securityGuideRuleTree(id, xRHIDENTITY, options)];
+                        case 0: return [4 /*yield*/, localVarAxiosParamCreator.securityGuideRuleTree(securityGuideId, xRHIDENTITY, options)];
                         case 1:
                             localVarAxiosArgs = _a.sent();
                             return [2 /*return*/, (0, common_1.createRequestFunction)(localVarAxiosArgs, axios_1.default, base_1.BASE_PATH, configuration)];
@@ -2870,7 +3553,7 @@ var SecurityGuideRuleTreeApiFactory = function (configuration, basePath, axios)
          * @throws {RequiredError}
          */
         securityGuideRuleTree: function (requestParameters, options) {
-            return localVarFp.securityGuideRuleTree(requestParameters.id, requestParameters.xRHIDENTITY, options).then(function (request) { return request(axios, basePath); });
+            return localVarFp.securityGuideRuleTree(requestParameters.securityGuideId, requestParameters.xRHIDENTITY, options).then(function (request) { return request(axios, basePath); });
         },
     };
 };
@@ -2896,7 +3579,7 @@ var SecurityGuideRuleTreeApi = /** @class */ (function (_super) {
      */
     SecurityGuideRuleTreeApi.prototype.securityGuideRuleTree = function (requestParameters, options) {
         var _this = this;
-        return (0, exports.SecurityGuideRuleTreeApiFp)(this.configuration).securityGuideRuleTree(requestParameters.id, requestParameters.xRHIDENTITY, options).then(function (request) { return request(_this.axios, _this.basePath); });
+        return (0, exports.SecurityGuideRuleTreeApiFp)(this.configuration).securityGuideRuleTree(requestParameters.securityGuideId, requestParameters.xRHIDENTITY, options).then(function (request) { return request(_this.axios, _this.basePath); });
     };
     return SecurityGuideRuleTreeApi;
 }(base_1.BaseAPI));
@@ -3197,20 +3880,20 @@ var SystemApiAxiosParamCreator = function (configuration) {
         /**
          * Returns a System
          * @summary Request a System
-         * @param {any} id
+         * @param {any} systemId
          * @param {any} [xRHIDENTITY] For internal use only
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        system: function (id, xRHIDENTITY, options) {
+        system: function (systemId, xRHIDENTITY, options) {
             if (options === void 0) { options = {}; }
             return tslib_1.__awaiter(_this, void 0, void 0, function () {
                 var localVarPath, localVarUrlObj, baseOptions, localVarRequestOptions, localVarHeaderParameter, localVarQueryParameter, headersFromBaseOptions;
                 return tslib_1.__generator(this, function (_a) {
-                    // verify required parameter 'id' is not null or undefined
-                    (0, common_1.assertParamExists)('system', 'id', id);
-                    localVarPath = "/systems/{id}"
-                        .replace("{".concat("id", "}"), encodeURIComponent(String(id)));
+                    // verify required parameter 'systemId' is not null or undefined
+                    (0, common_1.assertParamExists)('system', 'systemId', systemId);
+                    localVarPath = "/systems/{system_id}"
+                        .replace("{".concat("system_id", "}"), encodeURIComponent(String(systemId)));
                     localVarUrlObj = new URL(localVarPath, common_1.DUMMY_BASE_URL);
                     if (configuration) {
                         baseOptions = configuration.baseOptions;
@@ -3246,17 +3929,17 @@ var SystemApiFp = function (configuration) {
         /**
          * Returns a System
          * @summary Request a System
-         * @param {any} id
+         * @param {any} systemId
          * @param {any} [xRHIDENTITY] For internal use only
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        system: function (id, xRHIDENTITY, options) {
+        system: function (systemId, xRHIDENTITY, options) {
             return tslib_1.__awaiter(this, void 0, void 0, function () {
                 var localVarAxiosArgs;
                 return tslib_1.__generator(this, function (_a) {
                     switch (_a.label) {
-                        case 0: return [4 /*yield*/, localVarAxiosParamCreator.system(id, xRHIDENTITY, options)];
+                        case 0: return [4 /*yield*/, localVarAxiosParamCreator.system(systemId, xRHIDENTITY, options)];
                         case 1:
                             localVarAxiosArgs = _a.sent();
                             return [2 /*return*/, (0, common_1.createRequestFunction)(localVarAxiosArgs, axios_1.default, base_1.BASE_PATH, configuration)];
@@ -3282,7 +3965,7 @@ var SystemApiFactory = function (configuration, basePath, axios) {
          * @throws {RequiredError}
          */
         system: function (requestParameters, options) {
-            return localVarFp.system(requestParameters.id, requestParameters.xRHIDENTITY, options).then(function (request) { return request(axios, basePath); });
+            return localVarFp.system(requestParameters.systemId, requestParameters.xRHIDENTITY, options).then(function (request) { return request(axios, basePath); });
         },
     };
 };
@@ -3308,7 +3991,7 @@ var SystemApi = /** @class */ (function (_super) {
      */
     SystemApi.prototype.system = function (requestParameters, options) {
         var _this = this;
-        return (0, exports.SystemApiFp)(this.configuration).system(requestParameters.id, requestParameters.xRHIDENTITY, options).then(function (request) { return request(_this.axios, _this.basePath); });
+        return (0, exports.SystemApiFp)(this.configuration).system(requestParameters.systemId, requestParameters.xRHIDENTITY, options).then(function (request) { return request(_this.axios, _this.basePath); });
     };
     return SystemApi;
 }(base_1.BaseAPI));
@@ -3327,7 +4010,7 @@ var SystemsApiAxiosParamCreator = function (configuration) {
          * @param {any} [limit] Number of items to return per page
          * @param {any} [offset] Offset of first item of paginated response
          * @param {any} [sortBy] Attribute and direction to sort the items by. Represented by an array of fields with an optional direction (`<key>:asc` or `<key>:desc`).<br><br>If no direction is selected, `<key>:asc` is used by default.
-         * @param {any} [filter] Query string to filter items by their attributes. Compliant with <a href=\"https://github.com/wvanbergen/scoped_search/wiki/Query-language\" target=\"_blank\" title=\"github.com/wvanbergen/scoped_search\">scoped_search query language</a>. However, only `=` or `!=` (resp. `<>`) operators are supported.<br><br>Systems are searchable using attributes `display_name`, `os_major_version`, `os_minor_version`, and `assigned_or_scanned`<br><br>(e.g.: `(field_1=something AND field_2!=\"something else\") OR field_3>40`)
+         * @param {any} [filter] Query string to filter items by their attributes. Compliant with <a href=\"https://github.com/wvanbergen/scoped_search/wiki/Query-language\" target=\"_blank\" title=\"github.com/wvanbergen/scoped_search\">scoped_search query language</a>. However, only `=` or `!=` (resp. `<>`) operators are supported.<br><br>Systems are searchable using attributes `display_name`, `os_major_version`, `os_minor_version`, `assigned_or_scanned`, and `never_reported`<br><br>(e.g.: `(field_1=something AND field_2!=\"something else\") OR field_3>40`)
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
@@ -3388,7 +4071,7 @@ var SystemsApiFp = function (configuration) {
          * @param {any} [limit] Number of items to return per page
          * @param {any} [offset] Offset of first item of paginated response
          * @param {any} [sortBy] Attribute and direction to sort the items by. Represented by an array of fields with an optional direction (`<key>:asc` or `<key>:desc`).<br><br>If no direction is selected, `<key>:asc` is used by default.
-         * @param {any} [filter] Query string to filter items by their attributes. Compliant with <a href=\"https://github.com/wvanbergen/scoped_search/wiki/Query-language\" target=\"_blank\" title=\"github.com/wvanbergen/scoped_search\">scoped_search query language</a>. However, only `=` or `!=` (resp. `<>`) operators are supported.<br><br>Systems are searchable using attributes `display_name`, `os_major_version`, `os_minor_version`, and `assigned_or_scanned`<br><br>(e.g.: `(field_1=something AND field_2!=\"something else\") OR field_3>40`)
+         * @param {any} [filter] Query string to filter items by their attributes. Compliant with <a href=\"https://github.com/wvanbergen/scoped_search/wiki/Query-language\" target=\"_blank\" title=\"github.com/wvanbergen/scoped_search\">scoped_search query language</a>. However, only `=` or `!=` (resp. `<>`) operators are supported.<br><br>Systems are searchable using attributes `display_name`, `os_major_version`, `os_minor_version`, `assigned_or_scanned`, and `never_reported`<br><br>(e.g.: `(field_1=something AND field_2!=\"something else\") OR field_3>40`)
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
@@ -3613,23 +4296,23 @@ var TailoringApiAxiosParamCreator = function (configuration) {
          * Returns a Tailoring
          * @summary Request a Tailoring
          * @param {any} policyId
-         * @param {any} id
+         * @param {any} tailoringId UUID or OS minor version number
          * @param {any} [xRHIDENTITY] For internal use only
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        tailoring: function (policyId, id, xRHIDENTITY, options) {
+        tailoring: function (policyId, tailoringId, xRHIDENTITY, options) {
             if (options === void 0) { options = {}; }
             return tslib_1.__awaiter(_this, void 0, void 0, function () {
                 var localVarPath, localVarUrlObj, baseOptions, localVarRequestOptions, localVarHeaderParameter, localVarQueryParameter, headersFromBaseOptions;
                 return tslib_1.__generator(this, function (_a) {
                     // verify required parameter 'policyId' is not null or undefined
                     (0, common_1.assertParamExists)('tailoring', 'policyId', policyId);
-                    // verify required parameter 'id' is not null or undefined
-                    (0, common_1.assertParamExists)('tailoring', 'id', id);
-                    localVarPath = "/policies/{policy_id}/tailorings/{id}"
+                    // verify required parameter 'tailoringId' is not null or undefined
+                    (0, common_1.assertParamExists)('tailoring', 'tailoringId', tailoringId);
+                    localVarPath = "/policies/{policy_id}/tailorings/{tailoring_id}"
                         .replace("{".concat("policy_id", "}"), encodeURIComponent(String(policyId)))
-                        .replace("{".concat("id", "}"), encodeURIComponent(String(id)));
+                        .replace("{".concat("tailoring_id", "}"), encodeURIComponent(String(tailoringId)));
                     localVarUrlObj = new URL(localVarPath, common_1.DUMMY_BASE_URL);
                     if (configuration) {
                         baseOptions = configuration.baseOptions;
@@ -3666,17 +4349,17 @@ var TailoringApiFp = function (configuration) {
          * Returns a Tailoring
          * @summary Request a Tailoring
          * @param {any} policyId
-         * @param {any} id
+         * @param {any} tailoringId UUID or OS minor version number
          * @param {any} [xRHIDENTITY] For internal use only
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        tailoring: function (policyId, id, xRHIDENTITY, options) {
+        tailoring: function (policyId, tailoringId, xRHIDENTITY, options) {
             return tslib_1.__awaiter(this, void 0, void 0, function () {
                 var localVarAxiosArgs;
                 return tslib_1.__generator(this, function (_a) {
                     switch (_a.label) {
-                        case 0: return [4 /*yield*/, localVarAxiosParamCreator.tailoring(policyId, id, xRHIDENTITY, options)];
+                        case 0: return [4 /*yield*/, localVarAxiosParamCreator.tailoring(policyId, tailoringId, xRHIDENTITY, options)];
                         case 1:
                             localVarAxiosArgs = _a.sent();
                             return [2 /*return*/, (0, common_1.createRequestFunction)(localVarAxiosArgs, axios_1.default, base_1.BASE_PATH, configuration)];
@@ -3702,7 +4385,7 @@ var TailoringApiFactory = function (configuration, basePath, axios) {
          * @throws {RequiredError}
          */
         tailoring: function (requestParameters, options) {
-            return localVarFp.tailoring(requestParameters.policyId, requestParameters.id, requestParameters.xRHIDENTITY, options).then(function (request) { return request(axios, basePath); });
+            return localVarFp.tailoring(requestParameters.policyId, requestParameters.tailoringId, requestParameters.xRHIDENTITY, options).then(function (request) { return request(axios, basePath); });
         },
     };
 };
@@ -3728,7 +4411,7 @@ var TailoringApi = /** @class */ (function (_super) {
      */
     TailoringApi.prototype.tailoring = function (requestParameters, options) {
         var _this = this;
-        return (0, exports.TailoringApiFp)(this.configuration).tailoring(requestParameters.policyId, requestParameters.id, requestParameters.xRHIDENTITY, options).then(function (request) { return request(_this.axios, _this.basePath); });
+        return (0, exports.TailoringApiFp)(this.configuration).tailoring(requestParameters.policyId, requestParameters.tailoringId, requestParameters.xRHIDENTITY, options).then(function (request) { return request(_this.axios, _this.basePath); });
     };
     return TailoringApi;
 }(base_1.BaseAPI));
@@ -3744,23 +4427,23 @@ var TailoringFileApiAxiosParamCreator = function (configuration) {
          * Returns a Tailoring File
          * @summary Request a Tailoring file
          * @param {any} policyId
-         * @param {any} id
+         * @param {any} tailoringId UUID or OS minor version number
          * @param {any} [xRHIDENTITY] For internal use only
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        tailoringFile: function (policyId, id, xRHIDENTITY, options) {
+        tailoringFile: function (policyId, tailoringId, xRHIDENTITY, options) {
             if (options === void 0) { options = {}; }
             return tslib_1.__awaiter(_this, void 0, void 0, function () {
                 var localVarPath, localVarUrlObj, baseOptions, localVarRequestOptions, localVarHeaderParameter, localVarQueryParameter, headersFromBaseOptions;
                 return tslib_1.__generator(this, function (_a) {
                     // verify required parameter 'policyId' is not null or undefined
                     (0, common_1.assertParamExists)('tailoringFile', 'policyId', policyId);
-                    // verify required parameter 'id' is not null or undefined
-                    (0, common_1.assertParamExists)('tailoringFile', 'id', id);
-                    localVarPath = "/policies/{policy_id}/tailorings/{id}/tailoring_file.json"
+                    // verify required parameter 'tailoringId' is not null or undefined
+                    (0, common_1.assertParamExists)('tailoringFile', 'tailoringId', tailoringId);
+                    localVarPath = "/policies/{policy_id}/tailorings/{tailoring_id}/tailoring_file.json"
                         .replace("{".concat("policy_id", "}"), encodeURIComponent(String(policyId)))
-                        .replace("{".concat("id", "}"), encodeURIComponent(String(id)));
+                        .replace("{".concat("tailoring_id", "}"), encodeURIComponent(String(tailoringId)));
                     localVarUrlObj = new URL(localVarPath, common_1.DUMMY_BASE_URL);
                     if (configuration) {
                         baseOptions = configuration.baseOptions;
@@ -3797,17 +4480,17 @@ var TailoringFileApiFp = function (configuration) {
          * Returns a Tailoring File
          * @summary Request a Tailoring file
          * @param {any} policyId
-         * @param {any} id
+         * @param {any} tailoringId UUID or OS minor version number
          * @param {any} [xRHIDENTITY] For internal use only
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        tailoringFile: function (policyId, id, xRHIDENTITY, options) {
+        tailoringFile: function (policyId, tailoringId, xRHIDENTITY, options) {
             return tslib_1.__awaiter(this, void 0, void 0, function () {
                 var localVarAxiosArgs;
                 return tslib_1.__generator(this, function (_a) {
                     switch (_a.label) {
-                        case 0: return [4 /*yield*/, localVarAxiosParamCreator.tailoringFile(policyId, id, xRHIDENTITY, options)];
+                        case 0: return [4 /*yield*/, localVarAxiosParamCreator.tailoringFile(policyId, tailoringId, xRHIDENTITY, options)];
                         case 1:
                             localVarAxiosArgs = _a.sent();
                             return [2 /*return*/, (0, common_1.createRequestFunction)(localVarAxiosArgs, axios_1.default, base_1.BASE_PATH, configuration)];
@@ -3833,7 +4516,7 @@ var TailoringFileApiFactory = function (configuration, basePath, axios) {
          * @throws {RequiredError}
          */
         tailoringFile: function (requestParameters, options) {
-            return localVarFp.tailoringFile(requestParameters.policyId, requestParameters.id, requestParameters.xRHIDENTITY, options).then(function (request) { return request(axios, basePath); });
+            return localVarFp.tailoringFile(requestParameters.policyId, requestParameters.tailoringId, requestParameters.xRHIDENTITY, options).then(function (request) { return request(axios, basePath); });
         },
     };
 };
@@ -3859,7 +4542,7 @@ var TailoringFileApi = /** @class */ (function (_super) {
      */
     TailoringFileApi.prototype.tailoringFile = function (requestParameters, options) {
         var _this = this;
-        return (0, exports.TailoringFileApiFp)(this.configuration).tailoringFile(requestParameters.policyId, requestParameters.id, requestParameters.xRHIDENTITY, options).then(function (request) { return request(_this.axios, _this.basePath); });
+        return (0, exports.TailoringFileApiFp)(this.configuration).tailoringFile(requestParameters.policyId, requestParameters.tailoringId, requestParameters.xRHIDENTITY, options).then(function (request) { return request(_this.axios, _this.basePath); });
     };
     return TailoringFileApi;
 }(base_1.BaseAPI));
@@ -4173,12 +4856,12 @@ var UnassignRuleApiAxiosParamCreator = function (configuration) {
          * @summary Unassign a Rule from a Tailoring
          * @param {any} policyId
          * @param {any} tailoringId
-         * @param {any} id
+         * @param {any} ruleId UUID or ref_id
          * @param {any} [xRHIDENTITY] For internal use only
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        unassignRule: function (policyId, tailoringId, id, xRHIDENTITY, options) {
+        unassignRule: function (policyId, tailoringId, ruleId, xRHIDENTITY, options) {
             if (options === void 0) { options = {}; }
             return tslib_1.__awaiter(_this, void 0, void 0, function () {
                 var localVarPath, localVarUrlObj, baseOptions, localVarRequestOptions, localVarHeaderParameter, localVarQueryParameter, headersFromBaseOptions;
@@ -4187,12 +4870,12 @@ var UnassignRuleApiAxiosParamCreator = function (configuration) {
                     (0, common_1.assertParamExists)('unassignRule', 'policyId', policyId);
                     // verify required parameter 'tailoringId' is not null or undefined
                     (0, common_1.assertParamExists)('unassignRule', 'tailoringId', tailoringId);
-                    // verify required parameter 'id' is not null or undefined
-                    (0, common_1.assertParamExists)('unassignRule', 'id', id);
-                    localVarPath = "/policies/{policy_id}/tailorings/{tailoring_id}/rules/{id}"
+                    // verify required parameter 'ruleId' is not null or undefined
+                    (0, common_1.assertParamExists)('unassignRule', 'ruleId', ruleId);
+                    localVarPath = "/policies/{policy_id}/tailorings/{tailoring_id}/rules/{rule_id}"
                         .replace("{".concat("policy_id", "}"), encodeURIComponent(String(policyId)))
                         .replace("{".concat("tailoring_id", "}"), encodeURIComponent(String(tailoringId)))
-                        .replace("{".concat("id", "}"), encodeURIComponent(String(id)));
+                        .replace("{".concat("rule_id", "}"), encodeURIComponent(String(ruleId)));
                     localVarUrlObj = new URL(localVarPath, common_1.DUMMY_BASE_URL);
                     if (configuration) {
                         baseOptions = configuration.baseOptions;
@@ -4230,17 +4913,17 @@ var UnassignRuleApiFp = function (configuration) {
          * @summary Unassign a Rule from a Tailoring
          * @param {any} policyId
          * @param {any} tailoringId
-         * @param {any} id
+         * @param {any} ruleId UUID or ref_id
          * @param {any} [xRHIDENTITY] For internal use only
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        unassignRule: function (policyId, tailoringId, id, xRHIDENTITY, options) {
+        unassignRule: function (policyId, tailoringId, ruleId, xRHIDENTITY, options) {
             return tslib_1.__awaiter(this, void 0, void 0, function () {
                 var localVarAxiosArgs;
                 return tslib_1.__generator(this, function (_a) {
                     switch (_a.label) {
-                        case 0: return [4 /*yield*/, localVarAxiosParamCreator.unassignRule(policyId, tailoringId, id, xRHIDENTITY, options)];
+                        case 0: return [4 /*yield*/, localVarAxiosParamCreator.unassignRule(policyId, tailoringId, ruleId, xRHIDENTITY, options)];
                         case 1:
                             localVarAxiosArgs = _a.sent();
                             return [2 /*return*/, (0, common_1.createRequestFunction)(localVarAxiosArgs, axios_1.default, base_1.BASE_PATH, configuration)];
@@ -4266,7 +4949,7 @@ var UnassignRuleApiFactory = function (configuration, basePath, axios) {
          * @throws {RequiredError}
          */
         unassignRule: function (requestParameters, options) {
-            return localVarFp.unassignRule(requestParameters.policyId, requestParameters.tailoringId, requestParameters.id, requestParameters.xRHIDENTITY, options).then(function (request) { return request(axios, basePath); });
+            return localVarFp.unassignRule(requestParameters.policyId, requestParameters.tailoringId, requestParameters.ruleId, requestParameters.xRHIDENTITY, options).then(function (request) { return request(axios, basePath); });
         },
     };
 };
@@ -4292,7 +4975,7 @@ var UnassignRuleApi = /** @class */ (function (_super) {
      */
     UnassignRuleApi.prototype.unassignRule = function (requestParameters, options) {
         var _this = this;
-        return (0, exports.UnassignRuleApiFp)(this.configuration).unassignRule(requestParameters.policyId, requestParameters.tailoringId, requestParameters.id, requestParameters.xRHIDENTITY, options).then(function (request) { return request(_this.axios, _this.basePath); });
+        return (0, exports.UnassignRuleApiFp)(this.configuration).unassignRule(requestParameters.policyId, requestParameters.tailoringId, requestParameters.ruleId, requestParameters.xRHIDENTITY, options).then(function (request) { return request(_this.axios, _this.basePath); });
     };
     return UnassignRuleApi;
 }(base_1.BaseAPI));
@@ -4307,23 +4990,23 @@ var UnassignSystemApiAxiosParamCreator = function (configuration) {
         /**
          * Unassigns a System from a Policy
          * @summary Unassign a System from a Policy
-         * @param {any} id
+         * @param {any} systemId
          * @param {any} policyId
          * @param {any} [xRHIDENTITY] For internal use only
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        unassignSystem: function (id, policyId, xRHIDENTITY, options) {
+        unassignSystem: function (systemId, policyId, xRHIDENTITY, options) {
             if (options === void 0) { options = {}; }
             return tslib_1.__awaiter(_this, void 0, void 0, function () {
                 var localVarPath, localVarUrlObj, baseOptions, localVarRequestOptions, localVarHeaderParameter, localVarQueryParameter, headersFromBaseOptions;
                 return tslib_1.__generator(this, function (_a) {
-                    // verify required parameter 'id' is not null or undefined
-                    (0, common_1.assertParamExists)('unassignSystem', 'id', id);
+                    // verify required parameter 'systemId' is not null or undefined
+                    (0, common_1.assertParamExists)('unassignSystem', 'systemId', systemId);
                     // verify required parameter 'policyId' is not null or undefined
                     (0, common_1.assertParamExists)('unassignSystem', 'policyId', policyId);
-                    localVarPath = "/policies/{policy_id}/systems/{id}"
-                        .replace("{".concat("id", "}"), encodeURIComponent(String(id)))
+                    localVarPath = "/policies/{policy_id}/systems/{system_id}"
+                        .replace("{".concat("system_id", "}"), encodeURIComponent(String(systemId)))
                         .replace("{".concat("policy_id", "}"), encodeURIComponent(String(policyId)));
                     localVarUrlObj = new URL(localVarPath, common_1.DUMMY_BASE_URL);
                     if (configuration) {
@@ -4360,18 +5043,18 @@ var UnassignSystemApiFp = function (configuration) {
         /**
          * Unassigns a System from a Policy
          * @summary Unassign a System from a Policy
-         * @param {any} id
+         * @param {any} systemId
          * @param {any} policyId
          * @param {any} [xRHIDENTITY] For internal use only
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        unassignSystem: function (id, policyId, xRHIDENTITY, options) {
+        unassignSystem: function (systemId, policyId, xRHIDENTITY, options) {
             return tslib_1.__awaiter(this, void 0, void 0, function () {
                 var localVarAxiosArgs;
                 return tslib_1.__generator(this, function (_a) {
                     switch (_a.label) {
-                        case 0: return [4 /*yield*/, localVarAxiosParamCreator.unassignSystem(id, policyId, xRHIDENTITY, options)];
+                        case 0: return [4 /*yield*/, localVarAxiosParamCreator.unassignSystem(systemId, policyId, xRHIDENTITY, options)];
                         case 1:
                             localVarAxiosArgs = _a.sent();
                             return [2 /*return*/, (0, common_1.createRequestFunction)(localVarAxiosArgs, axios_1.default, base_1.BASE_PATH, configuration)];
@@ -4397,7 +5080,7 @@ var UnassignSystemApiFactory = function (configuration, basePath, axios) {
          * @throws {RequiredError}
          */
         unassignSystem: function (requestParameters, options) {
-            return localVarFp.unassignSystem(requestParameters.id, requestParameters.policyId, requestParameters.xRHIDENTITY, options).then(function (request) { return request(axios, basePath); });
+            return localVarFp.unassignSystem(requestParameters.systemId, requestParameters.policyId, requestParameters.xRHIDENTITY, options).then(function (request) { return request(axios, basePath); });
         },
     };
 };
@@ -4423,7 +5106,7 @@ var UnassignSystemApi = /** @class */ (function (_super) {
      */
     UnassignSystemApi.prototype.unassignSystem = function (requestParameters, options) {
         var _this = this;
-        return (0, exports.UnassignSystemApiFp)(this.configuration).unassignSystem(requestParameters.id, requestParameters.policyId, requestParameters.xRHIDENTITY, options).then(function (request) { return request(_this.axios, _this.basePath); });
+        return (0, exports.UnassignSystemApiFp)(this.configuration).unassignSystem(requestParameters.systemId, requestParameters.policyId, requestParameters.xRHIDENTITY, options).then(function (request) { return request(_this.axios, _this.basePath); });
     };
     return UnassignSystemApi;
 }(base_1.BaseAPI));
@@ -4438,21 +5121,21 @@ var UpdatePolicyApiAxiosParamCreator = function (configuration) {
         /**
          * Updates a Policy with the provided attributes
          * @summary Update a Policy
-         * @param {any} id
+         * @param {any} policyId
          * @param {any} [xRHIDENTITY] For internal use only
          * @param {PolicyUpdate} [policyUpdate]
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        updatePolicy: function (id, xRHIDENTITY, policyUpdate, options) {
+        updatePolicy: function (policyId, xRHIDENTITY, policyUpdate, options) {
             if (options === void 0) { options = {}; }
             return tslib_1.__awaiter(_this, void 0, void 0, function () {
                 var localVarPath, localVarUrlObj, baseOptions, localVarRequestOptions, localVarHeaderParameter, localVarQueryParameter, headersFromBaseOptions;
                 return tslib_1.__generator(this, function (_a) {
-                    // verify required parameter 'id' is not null or undefined
-                    (0, common_1.assertParamExists)('updatePolicy', 'id', id);
-                    localVarPath = "/policies/{id}"
-                        .replace("{".concat("id", "}"), encodeURIComponent(String(id)));
+                    // verify required parameter 'policyId' is not null or undefined
+                    (0, common_1.assertParamExists)('updatePolicy', 'policyId', policyId);
+                    localVarPath = "/policies/{policy_id}"
+                        .replace("{".concat("policy_id", "}"), encodeURIComponent(String(policyId)));
                     localVarUrlObj = new URL(localVarPath, common_1.DUMMY_BASE_URL);
                     if (configuration) {
                         baseOptions = configuration.baseOptions;
@@ -4490,18 +5173,18 @@ var UpdatePolicyApiFp = function (configuration) {
         /**
          * Updates a Policy with the provided attributes
          * @summary Update a Policy
-         * @param {any} id
+         * @param {any} policyId
          * @param {any} [xRHIDENTITY] For internal use only
          * @param {PolicyUpdate} [policyUpdate]
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        updatePolicy: function (id, xRHIDENTITY, policyUpdate, options) {
+        updatePolicy: function (policyId, xRHIDENTITY, policyUpdate, options) {
             return tslib_1.__awaiter(this, void 0, void 0, function () {
                 var localVarAxiosArgs;
                 return tslib_1.__generator(this, function (_a) {
                     switch (_a.label) {
-                        case 0: return [4 /*yield*/, localVarAxiosParamCreator.updatePolicy(id, xRHIDENTITY, policyUpdate, options)];
+                        case 0: return [4 /*yield*/, localVarAxiosParamCreator.updatePolicy(policyId, xRHIDENTITY, policyUpdate, options)];
                         case 1:
                             localVarAxiosArgs = _a.sent();
                             return [2 /*return*/, (0, common_1.createRequestFunction)(localVarAxiosArgs, axios_1.default, base_1.BASE_PATH, configuration)];
@@ -4527,7 +5210,7 @@ var UpdatePolicyApiFactory = function (configuration, basePath, axios) {
          * @throws {RequiredError}
          */
         updatePolicy: function (requestParameters, options) {
-            return localVarFp.updatePolicy(requestParameters.id, requestParameters.xRHIDENTITY, requestParameters.policyUpdate, options).then(function (request) { return request(axios, basePath); });
+            return localVarFp.updatePolicy(requestParameters.policyId, requestParameters.xRHIDENTITY, requestParameters.policyUpdate, options).then(function (request) { return request(axios, basePath); });
         },
     };
 };
@@ -4553,7 +5236,7 @@ var UpdatePolicyApi = /** @class */ (function (_super) {
      */
     UpdatePolicyApi.prototype.updatePolicy = function (requestParameters, options) {
         var _this = this;
-        return (0, exports.UpdatePolicyApiFp)(this.configuration).updatePolicy(requestParameters.id, requestParameters.xRHIDENTITY, requestParameters.policyUpdate, options).then(function (request) { return request(_this.axios, _this.basePath); });
+        return (0, exports.UpdatePolicyApiFp)(this.configuration).updatePolicy(requestParameters.policyId, requestParameters.xRHIDENTITY, requestParameters.policyUpdate, options).then(function (request) { return request(_this.axios, _this.basePath); });
     };
     return UpdatePolicyApi;
 }(base_1.BaseAPI));
@@ -4569,24 +5252,24 @@ var UpdateTailoringApiAxiosParamCreator = function (configuration) {
          * Updates a Tailoring with the provided value_overrides
          * @summary Update a Tailoring
          * @param {any} policyId
-         * @param {any} id
+         * @param {any} tailoringId UUID or OS minor version number
          * @param {any} [xRHIDENTITY] For internal use only
          * @param {Tailoring} [tailoring]
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        updateTailoring: function (policyId, id, xRHIDENTITY, tailoring, options) {
+        updateTailoring: function (policyId, tailoringId, xRHIDENTITY, tailoring, options) {
             if (options === void 0) { options = {}; }
             return tslib_1.__awaiter(_this, void 0, void 0, function () {
                 var localVarPath, localVarUrlObj, baseOptions, localVarRequestOptions, localVarHeaderParameter, localVarQueryParameter, headersFromBaseOptions;
                 return tslib_1.__generator(this, function (_a) {
                     // verify required parameter 'policyId' is not null or undefined
                     (0, common_1.assertParamExists)('updateTailoring', 'policyId', policyId);
-                    // verify required parameter 'id' is not null or undefined
-                    (0, common_1.assertParamExists)('updateTailoring', 'id', id);
-                    localVarPath = "/policies/{policy_id}/tailorings/{id}"
+                    // verify required parameter 'tailoringId' is not null or undefined
+                    (0, common_1.assertParamExists)('updateTailoring', 'tailoringId', tailoringId);
+                    localVarPath = "/policies/{policy_id}/tailorings/{tailoring_id}"
                         .replace("{".concat("policy_id", "}"), encodeURIComponent(String(policyId)))
-                        .replace("{".concat("id", "}"), encodeURIComponent(String(id)));
+                        .replace("{".concat("tailoring_id", "}"), encodeURIComponent(String(tailoringId)));
                     localVarUrlObj = new URL(localVarPath, common_1.DUMMY_BASE_URL);
                     if (configuration) {
                         baseOptions = configuration.baseOptions;
@@ -4625,18 +5308,18 @@ var UpdateTailoringApiFp = function (configuration) {
          * Updates a Tailoring with the provided value_overrides
          * @summary Update a Tailoring
          * @param {any} policyId
-         * @param {any} id
+         * @param {any} tailoringId UUID or OS minor version number
          * @param {any} [xRHIDENTITY] For internal use only
          * @param {Tailoring} [tailoring]
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        updateTailoring: function (policyId, id, xRHIDENTITY, tailoring, options) {
+        updateTailoring: function (policyId, tailoringId, xRHIDENTITY, tailoring, options) {
             return tslib_1.__awaiter(this, void 0, void 0, function () {
                 var localVarAxiosArgs;
                 return tslib_1.__generator(this, function (_a) {
                     switch (_a.label) {
-                        case 0: return [4 /*yield*/, localVarAxiosParamCreator.updateTailoring(policyId, id, xRHIDENTITY, tailoring, options)];
+                        case 0: return [4 /*yield*/, localVarAxiosParamCreator.updateTailoring(policyId, tailoringId, xRHIDENTITY, tailoring, options)];
                         case 1:
                             localVarAxiosArgs = _a.sent();
                             return [2 /*return*/, (0, common_1.createRequestFunction)(localVarAxiosArgs, axios_1.default, base_1.BASE_PATH, configuration)];
@@ -4662,7 +5345,7 @@ var UpdateTailoringApiFactory = function (configuration, basePath, axios) {
          * @throws {RequiredError}
          */
         updateTailoring: function (requestParameters, options) {
-            return localVarFp.updateTailoring(requestParameters.policyId, requestParameters.id, requestParameters.xRHIDENTITY, requestParameters.tailoring, options).then(function (request) { return request(axios, basePath); });
+            return localVarFp.updateTailoring(requestParameters.policyId, requestParameters.tailoringId, requestParameters.xRHIDENTITY, requestParameters.tailoring, options).then(function (request) { return request(axios, basePath); });
         },
     };
 };
@@ -4688,7 +5371,7 @@ var UpdateTailoringApi = /** @class */ (function (_super) {
      */
     UpdateTailoringApi.prototype.updateTailoring = function (requestParameters, options) {
         var _this = this;
-        return (0, exports.UpdateTailoringApiFp)(this.configuration).updateTailoring(requestParameters.policyId, requestParameters.id, requestParameters.xRHIDENTITY, requestParameters.tailoring, options).then(function (request) { return request(_this.axios, _this.basePath); });
+        return (0, exports.UpdateTailoringApiFp)(this.configuration).updateTailoring(requestParameters.policyId, requestParameters.tailoringId, requestParameters.xRHIDENTITY, requestParameters.tailoring, options).then(function (request) { return request(_this.axios, _this.basePath); });
     };
     return UpdateTailoringApi;
 }(base_1.BaseAPI));
@@ -4704,23 +5387,23 @@ var ValueDefinitionApiAxiosParamCreator = function (configuration) {
          * Returns a Value Definition
          * @summary Request a Value Definition
          * @param {any} securityGuideId
-         * @param {any} id
+         * @param {any} valueDefinitionId
          * @param {any} [xRHIDENTITY] For internal use only
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        valueDefinition: function (securityGuideId, id, xRHIDENTITY, options) {
+        valueDefinition: function (securityGuideId, valueDefinitionId, xRHIDENTITY, options) {
             if (options === void 0) { options = {}; }
             return tslib_1.__awaiter(_this, void 0, void 0, function () {
                 var localVarPath, localVarUrlObj, baseOptions, localVarRequestOptions, localVarHeaderParameter, localVarQueryParameter, headersFromBaseOptions;
                 return tslib_1.__generator(this, function (_a) {
                     // verify required parameter 'securityGuideId' is not null or undefined
                     (0, common_1.assertParamExists)('valueDefinition', 'securityGuideId', securityGuideId);
-                    // verify required parameter 'id' is not null or undefined
-                    (0, common_1.assertParamExists)('valueDefinition', 'id', id);
-                    localVarPath = "/security_guides/{security_guide_id}/value_definitions/{id}"
+                    // verify required parameter 'valueDefinitionId' is not null or undefined
+                    (0, common_1.assertParamExists)('valueDefinition', 'valueDefinitionId', valueDefinitionId);
+                    localVarPath = "/security_guides/{security_guide_id}/value_definitions/{value_definition_id}"
                         .replace("{".concat("security_guide_id", "}"), encodeURIComponent(String(securityGuideId)))
-                        .replace("{".concat("id", "}"), encodeURIComponent(String(id)));
+                        .replace("{".concat("value_definition_id", "}"), encodeURIComponent(String(valueDefinitionId)));
                     localVarUrlObj = new URL(localVarPath, common_1.DUMMY_BASE_URL);
                     if (configuration) {
                         baseOptions = configuration.baseOptions;
@@ -4757,17 +5440,17 @@ var ValueDefinitionApiFp = function (configuration) {
          * Returns a Value Definition
          * @summary Request a Value Definition
          * @param {any} securityGuideId
-         * @param {any} id
+         * @param {any} valueDefinitionId
          * @param {any} [xRHIDENTITY] For internal use only
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        valueDefinition: function (securityGuideId, id, xRHIDENTITY, options) {
+        valueDefinition: function (securityGuideId, valueDefinitionId, xRHIDENTITY, options) {
             return tslib_1.__awaiter(this, void 0, void 0, function () {
                 var localVarAxiosArgs;
                 return tslib_1.__generator(this, function (_a) {
                     switch (_a.label) {
-                        case 0: return [4 /*yield*/, localVarAxiosParamCreator.valueDefinition(securityGuideId, id, xRHIDENTITY, options)];
+                        case 0: return [4 /*yield*/, localVarAxiosParamCreator.valueDefinition(securityGuideId, valueDefinitionId, xRHIDENTITY, options)];
                         case 1:
                             localVarAxiosArgs = _a.sent();
                             return [2 /*return*/, (0, common_1.createRequestFunction)(localVarAxiosArgs, axios_1.default, base_1.BASE_PATH, configuration)];
@@ -4793,7 +5476,7 @@ var ValueDefinitionApiFactory = function (configuration, basePath, axios) {
          * @throws {RequiredError}
          */
         valueDefinition: function (requestParameters, options) {
-            return localVarFp.valueDefinition(requestParameters.securityGuideId, requestParameters.id, requestParameters.xRHIDENTITY, options).then(function (request) { return request(axios, basePath); });
+            return localVarFp.valueDefinition(requestParameters.securityGuideId, requestParameters.valueDefinitionId, requestParameters.xRHIDENTITY, options).then(function (request) { return request(axios, basePath); });
         },
     };
 };
@@ -4819,7 +5502,7 @@ var ValueDefinitionApi = /** @class */ (function (_super) {
      */
     ValueDefinitionApi.prototype.valueDefinition = function (requestParameters, options) {
         var _this = this;
-        return (0, exports.ValueDefinitionApiFp)(this.configuration).valueDefinition(requestParameters.securityGuideId, requestParameters.id, requestParameters.xRHIDENTITY, options).then(function (request) { return request(_this.axios, _this.basePath); });
+        return (0, exports.ValueDefinitionApiFp)(this.configuration).valueDefinition(requestParameters.securityGuideId, requestParameters.valueDefinitionId, requestParameters.xRHIDENTITY, options).then(function (request) { return request(_this.axios, _this.basePath); });
     };
     return ValueDefinitionApi;
 }(base_1.BaseAPI));