Merge pull request #542 from deepakala-k/sync_1030_commits

Sync HardwareIsolation 1030 commits to 1050

Author: rfrandse

meson.build

@@ -96,6 +96,7 @@ feature_map = {
   'redfish-license'                             : '-DBMCWEB_ENABLE_REDFISH_LICENSE',
   #'vm-nbdproxy'                                : '-DBMCWEB_ENABLE_VM_NBDPROXY',
   'ibm-led-extensions'                          : '-DBMCWEB_ENABLE_IBM_LED_EXTENSIONS',
+  'hw-isolation'                                : '-DBMCWEB_ENABLE_HW_ISOLATION',
 }
 
 # Get the options status and build a project summary to show which flags are

meson_options.txt

@@ -353,4 +353,11 @@ option('ibm-led-extensions',
       type : 'feature',
       value : 'disabled',
       description : 'Enable the IBM LED extensions such as lamp test and system attention indicators'
-)
+)
+
+option(
+      'hw-isolation',
+      type : 'feature',
+      value : 'disabled',
+      description : 'Enable the Hardware Isolation feature'
+)

redfish-core/include/error_messages.hpp

@@ -482,6 +482,41 @@ nlohmann::json propertyValueIncorrect(std::string_view arg1,
 void propertyValueIncorrect(crow::Response& res, std::string_view arg1,
                             std::string_view arg2);
 
+/**
+ * @brief Formats PropertyValueResourceConflict message into JSON
+ * Message body: "The property '%1' with the requested value of '%2' could
+ * not be written because the value conflicts with the state or configuration
+ * of the resource at '%3'."
+ *
+ * @param[in] arg1 Parameter of message that will replace %1 in its body.
+ * @param[in] arg2 Parameter of message that will replace %2 in its body.
+ * @param[in] arg3 Parameter of message that will replace %3 in its body.
+ *
+ * @returns Message PropertyValueResourceConflict to JSON */
+nlohmann::json propertyValueResourceConflict(const std::string& arg1,
+                                             const std::string& arg2,
+                                             const std::string& arg3);
+
+void propertyValueResourceConflict(crow::Response& res, const std::string& arg1,
+                                   const std::string& arg2,
+                                   const std::string& arg3);
+
+/**
+ * @brief Formats PropertyValueExternalConflict message into JSON
+ * Message body: "The property '%1' with the requested value of '%2' could not
+ * be written because the value is not available due to a configuration
+ * conflict."
+ *
+ * @param[in] arg1 Parameter of message that will replace %1 in its body.
+ * @param[in] arg2 Parameter of message that will replace %2 in its body.
+ *
+ * @returns Message PropertyValueExternalConflict to JSON */
+nlohmann::json propertyValueExternalConflict(const std::string& arg1,
+                                             const std::string& arg2);
+
+void propertyValueExternalConflict(crow::Response& res, const std::string& arg1,
+                                   const std::string& arg2);
+
 /**
  * @brief Formats ResourceCreationConflict message into JSON
  * Message body: "The resource could not be created.  The service has a resource

redfish-core/include/redfish.hpp

@@ -185,6 +185,8 @@ class RedfishService
         requestRoutesOperatingConfig(app);
         requestRoutesMemoryCollection(app);
         requestRoutesMemory(app);
+        requestRoutesSubProcessors(app);
+        requestRoutesSubProcessorsCore(app);
 
         requestRoutesSystemsCollection(app);
         requestRoutesSystems(app);
@@ -260,6 +262,10 @@ class RedfishService
 
         // Note, this must be the last route registered
         requestRoutesRedfish(app);
+
+#ifdef BMCWEB_ENABLE_HW_ISOLATION
+        requestRoutesSystemHardwareIsolationLogService(app);
+#endif
     }
 };
 

redfish-core/include/registries/openbmc_message_registry.hpp

@@ -567,6 +567,16 @@ constexpr std::array registry = {
             {"string"},
             "None.",
         }},
+    MessageEntry{
+        "HardwareIsolationReason",
+        {
+            "Indicates the condition that affects the health of this resource.",
+            "The reason for the resource isolation: %1",
+            "OK",
+            1,
+            {"string"},
+            "None.",
+        }},
     MessageEntry{"InvalidLoginAttempted",
                  {
                      "Indicates that a login was attempted on the specified "

redfish-core/include/utils/error_log_utils.hpp

@@ -0,0 +1,84 @@
+#pragma once
+
+namespace redfish
+{
+namespace error_log_utils
+{
+
+/*
+ * @brief The helper API to set the Redfish error log URI in the given
+ *        Redfish property JSON path based on the Hidden property
+ *        which will be present in the given error log D-Bus object.
+ *
+ * @param[in] aResp - The redfish response to return.
+ * @param[in] errorLogObjPath - The error log D-Bus object path.
+ * @param[in] errorLogPropPath - The Redfish property json path to fill URI.
+ * @param[in] isLink - The boolean to add URI as a Redfish link.
+ *
+ * @return NULL
+ *
+ * @note The "isLink" parameter is used to add the URI as a link (i.e with
+ *       "@odata.id"). If passed as "false" then, the suffix will be added
+ *       as "/attachment" along with the URI.
+ *
+ *       This API won't fill the given "errorLogPropPath" property if unable
+ *       to process the given error log D-Bus object since the error log
+ *       might delete by the user via Redfish but, we should not throw
+ *       internal error in that case, just log trace and return.
+ */
+inline void
+    setErrorLogUri(const std::shared_ptr<bmcweb::AsyncResp>& aResp,
+                   const sdbusplus::message::object_path& errorLogObjPath,
+                   const nlohmann::json::json_pointer& errorLogPropPath,
+                   const bool isLink)
+{
+    // Get the Hidden Property
+    crow::connections::systemBus->async_method_call(
+        [aResp, errorLogObjPath, errorLogPropPath,
+         isLink](const boost::system::error_code ec,
+                 std::variant<bool>& hiddenProperty) {
+        if (ec)
+        {
+            BMCWEB_LOG_ERROR
+                << "DBus response error [" << ec.value() << " : "
+                << ec.message() << "] when tried to get the Hidden property "
+                << "from the given error log object " << errorLogObjPath.str;
+            return;
+        }
+        bool* hiddenPropVal = std::get_if<bool>(&hiddenProperty);
+        if (hiddenPropVal == nullptr)
+        {
+            BMCWEB_LOG_ERROR << "Failed to get the Hidden property value "
+                             << "from the given error log object "
+                             << errorLogObjPath.str;
+            return;
+        }
+
+        std::string errLogUri{"/redfish/v1/Systems/system/LogServices/"};
+        if (*hiddenPropVal)
+        {
+            errLogUri.append("CELog/Entries/");
+        }
+        else
+        {
+            errLogUri.append("EventLog/Entries/");
+        }
+        errLogUri.append(errorLogObjPath.filename());
+
+        if (isLink)
+        {
+            aResp->res.jsonValue[errorLogPropPath] = {{"@odata.id", errLogUri}};
+        }
+        else
+        {
+            errLogUri.append("/attachment");
+            aResp->res.jsonValue[errorLogPropPath] = errLogUri;
+        }
+        },
+        "xyz.openbmc_project.Logging", errorLogObjPath.str,
+        "org.freedesktop.DBus.Properties", "Get",
+        "org.open_power.Logging.PEL.Entry", "Hidden");
+}
+
+} // namespace error_log_utils
+} // namespace redfish