Bump bmcweb version to 3e7ab70817a6e49684c7c01ec0f2d67630f36559

14 files changed, 181 insertions, 257 deletions

diff --git a/meta-ibs/meta-common/recipes-phosphor/interfaces/bmcweb/0001-Enable-vm-nbdproxy-option.patch b/meta-ibs/meta-common/recipes-phosphor/interfaces/bmcweb/0001-Enable-vm-nbdproxy-option.patch
index e738dcae15..3b7bebe838 100644
--- a/meta-ibs/meta-common/recipes-phosphor/interfaces/bmcweb/0001-Enable-vm-nbdproxy-option.patch
+++ b/meta-ibs/meta-common/recipes-phosphor/interfaces/bmcweb/0001-Enable-vm-nbdproxy-option.patch
@@ -1,6 +1,6 @@
-From dd0744e05c5de4f4e7f462e6a1bf1da20cbee10d Mon Sep 17 00:00:00 2001
-From: kx <kx@radix.pro>
-Date: Tue, 10 May 2022 17:10:11 +0300
+From 6ddaa18b318d0b4622cc9adc7909c8ac81c1510a Mon Sep 17 00:00:00 2001
+From: "Andrey V.Kosteltsev" <AKosteltsev@IBS.RU>
+Date: Tue, 6 Sep 2022 14:17:57 +0300
 Subject: [PATCH] Enable vm-nbdproxy option
 
 ---
@@ -9,20 +9,20 @@ Subject: [PATCH] Enable vm-nbdproxy option
  2 files changed, 6 insertions(+), 6 deletions(-)
 
 diff --git a/meson.build b/meson.build
-index e8897b393..a38a20466 100644
+index c293e00e..f3d1c53d 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -86,7 +86,7 @@ feature_map = {
+@@ -89,7 +89,7 @@ feature_map = {
    'static-hosting'                              : '-DBMCWEB_ENABLE_STATIC_HOSTING',
    'vm-websocket'                                : '-DBMCWEB_ENABLE_VM_WEBSOCKET',
    'xtoken-auth'                                 : '-DBMCWEB_ENABLE_XTOKEN_AUTHENTICATION',
 -  #'vm-nbdproxy'                                : '-DBMCWEB_ENABLE_VM_NBDPROXY',
-+  'vm-nbdproxy'                                 : '-DBMCWEB_ENABLE_VM_NBDPROXY',
++  'vm-nbdproxy'                                : '-DBMCWEB_ENABLE_VM_NBDPROXY',
  }
  
  # Get the options status and build a project summary to show which flags are
 diff --git a/meson_options.txt b/meson_options.txt
-index d943222a4..799ebfc59 100644
+index ecc7aebc..78b1d39c 100644
 --- a/meson_options.txt
 +++ b/meson_options.txt
 @@ -35,11 +35,11 @@ option(
diff --git a/meta-ibs/meta-common/recipes-phosphor/interfaces/bmcweb/0002-Add-http-ftp-nfs-protocols-to-un-filter-them-FT-58-T.patch b/meta-ibs/meta-common/recipes-phosphor/interfaces/bmcweb/0002-Add-http-ftp-nfs-protocols.patch
index 43951f221e..b40a1e3141 100644
--- a/meta-ibs/meta-common/recipes-phosphor/interfaces/bmcweb/0002-Add-http-ftp-nfs-protocols-to-un-filter-them-FT-58-T.patch
+++ b/meta-ibs/meta-common/recipes-phosphor/interfaces/bmcweb/0002-Add-http-ftp-nfs-protocols.patch
@@ -1,31 +1,27 @@
-From c0aa20aa2be501eb6b063a8e48b79d49bd5f230c Mon Sep 17 00:00:00 2001
+From 8efce5db7796c88bb5541c81e5c7fbfecfce4441 Mon Sep 17 00:00:00 2001
 From: Alexandr Ilenko <AIlenko@IBS.RU>
-Date: Mon, 6 Jun 2022 06:35:59 +0300
-Subject: [PATCH 2/2] Add: http, ftp, nfs protocols, to un-filter them (FT-58,
- TZ-5.1.2.3)
+Date: Tue, 6 Sep 2022 14:24:54 +0300
+Subject: [PATCH] Add: http, ftp, nfs protocols
 
 ---
- redfish-core/lib/virtual_media.hpp | 33 ++++++++++++++++++++++++++++++
- 1 file changed, 33 insertions(+)
+ redfish-core/lib/virtual_media.hpp | 30 ++++++++++++++++++++++++++++++
+ 1 file changed, 30 insertions(+)
 
 diff --git a/redfish-core/lib/virtual_media.hpp b/redfish-core/lib/virtual_media.hpp
-index e94e233..1cce8fe 100644
+index 17971dc0..65d53b6b 100644
 --- a/redfish-core/lib/virtual_media.hpp
 +++ b/redfish-core/lib/virtual_media.hpp
-@@ -296,6 +296,12 @@ enum class TransferProtocol
+@@ -285,6 +285,9 @@ enum class TransferProtocol
  {
      https,
      smb,
-+    // 5.1.2.3.	(ФТ-58) Работа с образами виртуальных носителей на внешних серверах
-+    // •	Обеспечить настройку через web-интерфейс параметров для загрузки образов виртуальных носителей через USB2 и USB1 и с внешних ресурсов HTTP, FTP, SMB, NFS.
 +    http,
 +    ftp,
 +    nfs,
-+    //
      invalid
  };
  
-@@ -315,6 +321,18 @@ inline std::optional<TransferProtocol>
+@@ -304,6 +307,18 @@ inline std::optional<TransferProtocol>
      {
          return TransferProtocol::https;
      }
@@ -44,7 +40,7 @@ index e94e233..1cce8fe 100644
      if (!scheme.empty())
      {
          return TransferProtocol::invalid;
-@@ -345,6 +363,21 @@ inline std::optional<TransferProtocol> getTransferProtocolFromParam(
+@@ -334,6 +349,21 @@ inline std::optional<TransferProtocol> getTransferProtocolFromParam(
          return TransferProtocol::https;
      }
  
diff --git a/meta-ibs/meta-common/recipes-phosphor/interfaces/bmcweb/0003-Revert-Rearrange-forward_unauthorized.patch b/meta-ibs/meta-common/recipes-phosphor/interfaces/bmcweb/0003-Revert-Rearrange-forward_unauthorized.patch
index 185f158230..df924cf7c0 100644
--- a/meta-ibs/meta-common/recipes-phosphor/interfaces/bmcweb/0003-Revert-Rearrange-forward_unauthorized.patch
+++ b/meta-ibs/meta-common/recipes-phosphor/interfaces/bmcweb/0003-Revert-Rearrange-forward_unauthorized.patch
@@ -1,20 +1,20 @@
-From 008560b02f941ba73b5ff84db42f7e28e668aea2 Mon Sep 17 00:00:00 2001
+From 3ee7ad700beebc5abe9bed064ce9c0e9358e6040 Mon Sep 17 00:00:00 2001
 From: Nikita Kosenkov <NKosenkov@IBS.RU>
-Date: Wed, 27 Jul 2022 10:44:41 +0300
-Subject: [PATCH] Revert "Rearrange forward_unauthorized"
+Date: Tue, 6 Sep 2022 14:36:21 +0300
+Subject: [PATCH] Revert 'Rearrange forward_unauthorized'
 
 This reverts commit 347d1a195e1f0a9765bc8ae7be39f6eb6577d487.
 ---
- include/forward_unauthorized.hpp | 43 ++++++++++++++++----------------
- 1 file changed, 22 insertions(+), 21 deletions(-)
+ include/forward_unauthorized.hpp | 42 +++++++++++++++++---------------
+ 1 file changed, 22 insertions(+), 20 deletions(-)
 
 diff --git a/include/forward_unauthorized.hpp b/include/forward_unauthorized.hpp
-index ddf3e3b1..5b437b16 100644
+index a48b7753..327a9419 100644
 --- a/include/forward_unauthorized.hpp
 +++ b/include/forward_unauthorized.hpp
-@@ -22,30 +22,31 @@ inline void sendUnauthorized(std::string_view url,
+@@ -22,29 +22,31 @@ inline void sendUnauthorized(std::string_view url,
              res.result(boost::beast::http::status::temporary_redirect);
-             res.addHeader("Location",
+             res.addHeader(boost::beast::http::field::location,
                            "/#/login?next=" + http_helpers::urlEncode(url));
 -            return;
          }
@@ -62,9 +62,8 @@ index ddf3e3b1..5b437b16 100644
 +            }
 +        }
      }
--    res.addHeader("WWW-Authenticate", "Basic");
+     res.addHeader(boost::beast::http::field::www_authenticate, "Basic");
  }
- } // namespace forward_unauthorized
 -- 
 2.35.1
 
diff --git a/meta-ibs/meta-common/recipes-phosphor/interfaces/bmcweb/0004-IBS-Add-redfish2phosphor-logs.patch b/meta-ibs/meta-common/recipes-phosphor/interfaces/bmcweb/0004-IBS-Add-redfish2phosphor-logs.patch
index 841aac9ee7..4dec7e09e8 100644
--- a/meta-ibs/meta-common/recipes-phosphor/interfaces/bmcweb/0004-IBS-Add-redfish2phosphor-logs.patch
+++ b/meta-ibs/meta-common/recipes-phosphor/interfaces/bmcweb/0004-IBS-Add-redfish2phosphor-logs.patch
@@ -1,19 +1,19 @@
-From ce9c3f061f24bfd4ca1734b1bf3601f56a898839 Mon Sep 17 00:00:00 2001
+From 3fc3a75cb49d59019ac0350388dde06d333b9156 Mon Sep 17 00:00:00 2001
 From: "Evgeny Alekseev (IBS Group)" <ealekseev@ibs.sila.ru>
-Date: Mon, 8 Aug 2022 16:52:52 +0300
+Date: Tue, 6 Sep 2022 14:45:36 +0300
 Subject: [PATCH] IBS: Add redfish2phosphor-logs
 
 ---
  meson.build                   |  12 ++
- src/redfish2phosphor-logs.cpp | 209 ++++++++++++++++++++++++++++++++++
- 2 files changed, 221 insertions(+)
+ src/redfish2phosphor-logs.cpp | 210 ++++++++++++++++++++++++++++++++++
+ 2 files changed, 222 insertions(+)
  create mode 100644 src/redfish2phosphor-logs.cpp
 
 diff --git a/meson.build b/meson.build
-index 7d8ccce8..45d440ef 100644
+index f3d1c53d..510a8287 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -244,6 +244,7 @@ language : 'cpp')
+@@ -252,6 +252,7 @@ language : 'cpp')
  # Find the dependency modules, if not found use meson wrap to get them
  # automatically during the configure step
  bmcweb_dependencies = []
@@ -21,7 +21,7 @@ index 7d8ccce8..45d440ef 100644
  
  pam = cxx.find_library('pam', required: true)
  atomic =  cxx.find_library('atomic', required: true)
-@@ -257,6 +258,7 @@ if not sdbusplus.found()
+@@ -265,6 +266,7 @@ if not sdbusplus.found()
    sdbusplus = sdbusplus.as_system('system')
  endif
  bmcweb_dependencies += sdbusplus
@@ -29,7 +29,7 @@ index 7d8ccce8..45d440ef 100644
  
  tinyxml = dependency('tinyxml2',
      default_options: ['tests=false'],
-@@ -331,6 +333,7 @@ configure_file(input: 'bmcweb_config.h.in',
+@@ -339,6 +341,7 @@ configure_file(input: 'bmcweb_config.h.in',
  systemd_system_unit_dir = systemd.get_variable(pkgconfig: 'systemdsystemunitdir')
  
  bindir = get_option('prefix') + '/' +get_option('bindir')
@@ -37,7 +37,7 @@ index 7d8ccce8..45d440ef 100644
  
  summary({
            'prefix' : get_option('prefix'),
-@@ -382,6 +385,15 @@ executable(
+@@ -390,6 +393,15 @@ executable(
    install_dir:bindir
  )
  
@@ -55,10 +55,11 @@ index 7d8ccce8..45d440ef 100644
    'http/ut/router_test.cpp',
 diff --git a/src/redfish2phosphor-logs.cpp b/src/redfish2phosphor-logs.cpp
 new file mode 100644
-index 00000000..77f79c02
+index 00000000..1bd51cac
 --- /dev/null
 +++ b/src/redfish2phosphor-logs.cpp
-@@ -0,0 +1,209 @@
+@@ -0,0 +1,210 @@
++
 +#define BMCWEB_ENABLE_LOGGING 1
 +#include <syslog.h>
 +#include <systemd/sd-journal.h>
@@ -268,4 +269,6 @@ index 00000000..77f79c02
 +    }
 +    return 0;
 +}
-\ No newline at end of file
+-- 
+2.35.1
+
diff --git a/meta-ibs/meta-common/recipes-phosphor/interfaces/bmcweb/0005-Add-Sensor-Warning-Threshold-Edit.patch b/meta-ibs/meta-common/recipes-phosphor/interfaces/bmcweb/0005-Add-Sensor-Warning-Threshold-Edit.patch
index 9326e5bb83..f1651c2909 100644
--- a/meta-ibs/meta-common/recipes-phosphor/interfaces/bmcweb/0005-Add-Sensor-Warning-Threshold-Edit.patch
+++ b/meta-ibs/meta-common/recipes-phosphor/interfaces/bmcweb/0005-Add-Sensor-Warning-Threshold-Edit.patch
@@ -1,19 +1,19 @@
-From b4e619d9419fbccd818992330630af4920623796 Mon Sep 17 00:00:00 2001
+From 43710eca31b6fb8a69f565029710422b8dc067c7 Mon Sep 17 00:00:00 2001
 From: "Evgeny Alekseev (IBS Group)" <ealekseev@ibs.sila.ru>
-Date: Wed, 10 Aug 2022 15:28:47 +0300
+Date: Tue, 6 Sep 2022 14:55:47 +0300
 Subject: [PATCH] [*]Add Sensor Warning Threshold Edit
 
 ---
- redfish-core/lib/power.hpp   |   6 +-
- redfish-core/lib/sensors.hpp | 150 +++++++++++++++++++++++++++++++++++
+ redfish-core/lib/power.hpp   |   4 +-
+ redfish-core/lib/sensors.hpp | 145 +++++++++++++++++++++++++++++++++++
  redfish-core/lib/thermal.hpp |   2 +-
- 3 files changed, 155 insertions(+), 3 deletions(-)
+ 3 files changed, 149 insertions(+), 2 deletions(-)
 
 diff --git a/redfish-core/lib/power.hpp b/redfish-core/lib/power.hpp
-index bc18157c..aff60ebf 100644
+index cecaeab4..d20b3bcc 100644
 --- a/redfish-core/lib/power.hpp
 +++ b/redfish-core/lib/power.hpp
-@@ -22,6 +22,8 @@
+@@ -23,6 +23,8 @@
  #include <dbus_utility.hpp>
  #include <query.hpp>
  #include <registries/privilege_registry.hpp>
@@ -22,25 +22,20 @@ index bc18157c..aff60ebf 100644
  
  namespace redfish
  {
-@@ -331,11 +333,11 @@ inline void requestRoutesPower(App& app)
-             setPowerCapOverride(sensorAsyncResp, *powerCtlCollections);
-         }
-         if (voltageCollections)
--        {
-+        {            
+@@ -338,7 +340,7 @@ inline void requestRoutesPower(App& app)
              std::unordered_map<std::string, std::vector<nlohmann::json>>
                  allCollections;
              allCollections.emplace("Voltages", *std::move(voltageCollections));
 -            setSensorsOverride(sensorAsyncResp, allCollections);
-+            setSensorsWarning(sensorAsyncResp, allCollections);                        
++            setSensorsWarning(sensorAsyncResp, allCollections);
          }
          });
  }
 diff --git a/redfish-core/lib/sensors.hpp b/redfish-core/lib/sensors.hpp
-index 04b5190f..1601e8ed 100644
+index cf63bd70..1c636f20 100644
 --- a/redfish-core/lib/sensors.hpp
 +++ b/redfish-core/lib/sensors.hpp
-@@ -30,6 +30,8 @@
+@@ -34,6 +34,8 @@
  #include <cmath>
  #include <iterator>
  #include <map>
@@ -49,29 +44,10 @@ index 04b5190f..1601e8ed 100644
  #include <set>
  #include <utility>
  #include <variant>
-@@ -2762,6 +2764,7 @@ inline bool
-     return false;
+@@ -2855,6 +2857,149 @@ inline void setSensorsOverride(
+                std::move(getChassisSensorListCb));
  }
  
-+
- /**
-  * @brief Entry point for overriding sensor values of given sensor
-  *
-@@ -2769,6 +2772,7 @@ inline bool
-  * @param allCollections   Collections extract from sensors' request patch info
-  * @param chassisSubNode   Chassis Node for which the query has to happen
-  */
-+
- inline void setSensorsOverride(
-     const std::shared_ptr<SensorsAsyncResp>& sensorAsyncResp,
-     std::unordered_map<std::string, std::vector<nlohmann::json>>&
-@@ -2898,6 +2902,152 @@ inline void setSensorsOverride(
-     // get full sensor list for the given chassisId and cross verify the sensor.
-     getChassis(sensorAsyncResp, std::move(getChassisSensorListCb));
- }
-+ 
-+
-+
 +/**
 + * @brief Entry point for setting sensor warning level of given sensor
 + *
@@ -97,13 +73,12 @@ index 04b5190f..1601e8ed 100644
 +    double value = 0.0;
 +    for (auto& collectionItems : allCollections)
 +    {
-+        
 +        for (auto& item : collectionItems.second)
 +        {
 +            for(auto const &elem: validThresholdNames)
 +                {
 +                    if(item.contains(elem.first))propertyValueName = elem.first.c_str();
-+                }    
++                }
 +            if (!json_util::readJson(item, sensorAsyncResp->asyncResp->res,
 +                                     "MemberId", memberId, propertyValueName,
 +                                     value))
@@ -118,9 +93,9 @@ index 04b5190f..1601e8ed 100644
 +        }
 +    }
 +    for(auto [key, val] : overrideMap)
-+        BMCWEB_LOG_INFO << "Override entry:" << key << " " 
-+            << std::get<0>(val) << " " 
-+            << std::get<1>(val)<< " " 
++        BMCWEB_LOG_INFO << "Override entry:" << key << " "
++            << std::get<0>(val) << " "
++            << std::get<1>(val)<< " "
 +            << std::get<2>(val);
 +
 +    auto getChassisSensorListCb =
@@ -215,9 +190,10 @@ index 04b5190f..1601e8ed 100644
 +    // get full sensor list for the given chassisId and cross verify the sensor.
 +    getChassis(sensorAsyncResp, std::move(getChassisSensorListCb));
 +}
- 
++
  /**
   * @brief Retrieves mapping of Redfish URIs to sensor value property to D-Bus
+  * path of the sensor.
 diff --git a/redfish-core/lib/thermal.hpp b/redfish-core/lib/thermal.hpp
 index 83f79af3..a44a4791 100644
 --- a/redfish-core/lib/thermal.hpp
@@ -231,3 +207,6 @@ index 83f79af3..a44a4791 100644
          });
  }
  
+-- 
+2.35.1
+
diff --git a/meta-ibs/meta-common/recipes-phosphor/interfaces/bmcweb/0006-IBS-bmcweb-evt-registry-add-BMCTimeUpdatedViaNTP.patch b/meta-ibs/meta-common/recipes-phosphor/interfaces/bmcweb/0006-IBS-bmcweb-evt-registry-add-BMCTimeUpdatedViaNTP.patch
index f4a9c0ed7e..e1ce9ff163 100644
--- a/meta-ibs/meta-common/recipes-phosphor/interfaces/bmcweb/0006-IBS-bmcweb-evt-registry-add-BMCTimeUpdatedViaNTP.patch
+++ b/meta-ibs/meta-common/recipes-phosphor/interfaces/bmcweb/0006-IBS-bmcweb-evt-registry-add-BMCTimeUpdatedViaNTP.patch
@@ -1,6 +1,6 @@
-From fe0561165a7f45b41f2e995c803aa084cba943a3 Mon Sep 17 00:00:00 2001
+From b25eafa664a001d1691fdb5dcefc5b92c6c5751b Mon Sep 17 00:00:00 2001
 From: "Evgeny Alekseev (IBS Group)" <ealekseev@ibs.sila.ru>
-Date: Mon, 8 Aug 2022 16:49:47 +0300
+Date: Tue, 6 Sep 2022 14:59:58 +0300
 Subject: [PATCH] IBS: bmcweb evt registry add BMCTimeUpdatedViaNTP
 
 ---
@@ -8,10 +8,10 @@ Subject: [PATCH] IBS: bmcweb evt registry add BMCTimeUpdatedViaNTP
  1 file changed, 10 insertions(+)
 
 diff --git a/redfish-core/include/registries/openbmc_message_registry.hpp b/redfish-core/include/registries/openbmc_message_registry.hpp
-index 80d30c30..6c616af7 100644
+index 4810eb47..b2af1a25 100644
 --- a/redfish-core/include/registries/openbmc_message_registry.hpp
 +++ b/redfish-core/include/registries/openbmc_message_registry.hpp
-@@ -2257,6 +2257,16 @@ constexpr std::array registry = {
+@@ -2298,6 +2298,16 @@ constexpr std::array registry = {
              {"string"},
              "None.",
          }},
@@ -24,7 +24,10 @@ index 80d30c30..6c616af7 100644
 +            0,
 +            {},
 +            "None.",
-+        }},    
++        }},
  
  };
  } // namespace redfish::registries::openbmc
+-- 
+2.35.1
+
diff --git a/meta-ibs/meta-common/recipes-phosphor/interfaces/bmcweb/0007-Add-critical-thresholds-to-redfish.patch b/meta-ibs/meta-common/recipes-phosphor/interfaces/bmcweb/0007-Add-critical-thresholds-to-redfish.patch
index 7f17907cd8..56f6e40644 100644
--- a/meta-ibs/meta-common/recipes-phosphor/interfaces/bmcweb/0007-Add-critical-thresholds-to-redfish.patch
+++ b/meta-ibs/meta-common/recipes-phosphor/interfaces/bmcweb/0007-Add-critical-thresholds-to-redfish.patch
@@ -1,6 +1,6 @@
-From 769c987c73a51ea376ffc814db909a0d9ae7d1cd Mon Sep 17 00:00:00 2001
+From e147e3a45d7985b2f7c3393a6216288687cf5496 Mon Sep 17 00:00:00 2001
 From: "Evgeny Alekseev (IBS Group)" <ealekseev@ibs.sila.ru>
-Date: Fri, 12 Aug 2022 15:29:40 +0300
+Date: Tue, 6 Sep 2022 15:08:39 +0300
 Subject: [PATCH] Add critical thresholds to redfish
 
 ---
@@ -8,17 +8,17 @@ Subject: [PATCH] Add critical thresholds to redfish
  1 file changed, 12 insertions(+), 5 deletions(-)
 
 diff --git a/redfish-core/lib/sensors.hpp b/redfish-core/lib/sensors.hpp
-index 1601e8ed..5a0efecf 100644
+index 1c636f20..f7d6bc3b 100644
 --- a/redfish-core/lib/sensors.hpp
 +++ b/redfish-core/lib/sensors.hpp
-@@ -2924,9 +2924,11 @@ inline void setSensorsWarning(
+@@ -2876,9 +2876,11 @@ inline void setSensorsWarning(
      std::unordered_map<std::string, std::tuple<double, std::string, std::string>> overrideMap;
      std::string memberId;
      std::string thresholdName;
 -    static const std::unordered_map<std::string, std::string> validThresholdNames = 
 -        {{std::string {"LowerThresholdNonCritical"},std::string {"WarningLow"}},
 -        {std::string {"UpperThresholdNonCritical"},std::string {"WarningHigh"}}};
-+    static const std::unordered_map<std::string, std::tuple<std::string, std::string>> validThresholdNames = 
++    static const std::unordered_map<std::string, std::tuple<std::string, std::string>> validThresholdNames =
 +        {{std::string {"LowerThresholdNonCritical"},std::make_tuple(std::string("WarningLow"), std::string("xyz.openbmc_project.Sensor.Threshold.Warning"))},
 +        {std::string {"UpperThresholdNonCritical"},std::make_tuple(std::string("WarningHigh"), std::string("xyz.openbmc_project.Sensor.Threshold.Warning"))},
 +        {std::string {"LowerThresholdCritical"},std::make_tuple(std::string("CriticalLow"), std::string("xyz.openbmc_project.Sensor.Threshold.Critical"))},
@@ -26,19 +26,19 @@ index 1601e8ed..5a0efecf 100644
      double value = 0.0;
      for (auto& collectionItems : allCollections)
      {
-@@ -2936,6 +2938,11 @@ inline void setSensorsWarning(
-             for(auto const &elem: validThresholdNames)
+@@ -2888,6 +2890,11 @@ inline void setSensorsWarning(
                  {
                      if(item.contains(elem.first))propertyValueName = elem.first.c_str();
-+                }
+                 }
 +                if(!propertyValueName)
 +                {
-+                   messages::actionParameterMissing(sensorAsyncResp->asyncResp->res, collectionItems.first, "Threshold"); 
++                   messages::actionParameterMissing(sensorAsyncResp->asyncResp->res, collectionItems.first, "Threshold");
 +                   return;
-                 }    
++                }
              if (!json_util::readJson(item, sensorAsyncResp->asyncResp->res,
                                       "MemberId", memberId, propertyValueName,
-@@ -3013,7 +3020,7 @@ inline void setSensorsWarning(
+                                      value))
+@@ -2964,7 +2971,7 @@ inline void setSensorsWarning(
                      messages::internalError(sensorAsyncResp->asyncResp->res);
                      return;
                  }
@@ -47,7 +47,7 @@ index 1601e8ed..5a0efecf 100644
  
                  crow::connections::systemBus->async_method_call(
                      [sensorAsyncResp](const boost::system::error_code ec) {
-@@ -3037,7 +3044,7 @@ inline void setSensorsWarning(
+@@ -2988,7 +2995,7 @@ inline void setSensorsWarning(
                      }
                      },
                      item.second, item.first, "org.freedesktop.DBus.Properties",
@@ -56,3 +56,6 @@ index 1601e8ed..5a0efecf 100644
                      dbus::utility::DbusVariantType(std::get<0>(iterator->second)));
              }
          };
+-- 
+2.35.1
+
diff --git a/meta-ibs/meta-common/recipes-phosphor/interfaces/bmcweb/0008-Add-additional-logs-about-time-sync.patch b/meta-ibs/meta-common/recipes-phosphor/interfaces/bmcweb/0008-Add-additional-logs-about-time-sync.patch
index 222976d9a9..e0bdbeefb8 100644
--- a/meta-ibs/meta-common/recipes-phosphor/interfaces/bmcweb/0008-Add-additional-logs-about-time-sync.patch
+++ b/meta-ibs/meta-common/recipes-phosphor/interfaces/bmcweb/0008-Add-additional-logs-about-time-sync.patch
@@ -1,87 +1,50 @@
-From d2307a20a9b6becc5c8a43865b9477307219a3f9 Mon Sep 17 00:00:00 2001
+From ca613cdce4d3749e40306f940f403d29b80f34d1 Mon Sep 17 00:00:00 2001
 From: Nikita Kosenkov <NKosenkov@IBS.RU>
-Date: Mon, 15 Aug 2022 09:46:57 +0300
+Date: Tue, 6 Sep 2022 15:17:37 +0300
 Subject: [PATCH] Add additional logs about time sync
 
 ---
- .../registries/openbmc_message_registry.hpp   | 66 ++++++++++++++-----
- 1 file changed, 48 insertions(+), 18 deletions(-)
+ .../registries/openbmc_message_registry.hpp   | 30 +++++++++++++++++++
+ 1 file changed, 30 insertions(+)
 
 diff --git a/redfish-core/include/registries/openbmc_message_registry.hpp b/redfish-core/include/registries/openbmc_message_registry.hpp
-index 6c616af7..2b8d476c 100644
+index b2af1a25..6dd467e8 100644
 --- a/redfish-core/include/registries/openbmc_message_registry.hpp
 +++ b/redfish-core/include/registries/openbmc_message_registry.hpp
-@@ -2248,25 +2248,55 @@ constexpr std::array registry = {
-                      "None.",
-                  }},
-     MessageEntry{
--        "VoltageRegulatorOverheated",
--        {
--            "Indicates that the specified voltage regulator overheated.",
--            "%1 Voltage Regulator Overheated.",
--            "Critical",
--            1,
--            {"string"},
--            "None.",
--        }},
-+                "VoltageRegulatorOverheated",
-+                {
-+                    "Indicates that the specified voltage regulator overheated.",
-+                    "%1 Voltage Regulator Overheated.",
-+                    "Critical",
-+                    1,
-+                    {"string"},
-+                    "None.",
-+                }},
-     MessageEntry{
--        "BMCTimeUpdatedViaNTP",
--        {
--            "Indicates that time was updated via NTP.",
--            "BMC Time updated via NTP. Time: new %1, old %2.",
--            "OK",
--            0,
--            {},
--            "None.",
--        }},    
-+                "BMCTimeUpdatedViaNTP",
-+                {
-+                    "Indicates that time was updated via NTP.",
-+                    "BMC Time updated via NTP. Time: new %1, old %2.",
-+                    "OK",
-+                    0,
-+                    {},
-+                    "None.",
-+                }},
+@@ -2308,6 +2308,36 @@ constexpr std::array registry = {
+             {},
+             "None.",
+         }},
 +    MessageEntry{
-+                "BMCTimeUpdatedManually",
-+                {
-+                    "Indicates that time was manually updated.",
-+                    "BMC time updated manually: Time: new %1, old %2.",
-+                    "OK",
-+                    0,
-+                    {},
-+                    "None.",
-+                }},
++        "BMCTimeUpdatedManually",
++        {
++            "Indicates that time was manually updated.",
++            "BMC time updated manually: Time: new %1, old %2.",
++            "OK",
++            0,
++            {},
++            "None.",
++        }},
 +    MessageEntry{
-+                "BMCTimeRestoringFromTimestamp",
-+                {
-+                    "Indicates that time was restored from recorded timestamp.",
-+                    "BMC system clock time unset or jumped backwards, restoring from recorded timestamp: %1.",
-+                    "Warning",
-+                    0,
-+                    {},
-+                    "None.",
-+                }},
++        "BMCTimeRestoringFromTimestamp",
++        {
++            "Indicates that time was restored from recorded timestamp.",
++            "BMC system clock time unset or jumped backwards, restoring from recorded timestamp: %1.",
++            "Warning",
++            0,
++            {},
++            "None.",
++        }},
 +    MessageEntry{
-+                "BMCTimeNotUpdatedViaNTP",
-+                {
-+                    "Indicates that time was restored from recorded timestamp.",
-+                    "BMC timed out waiting for reply from NTP server: %1 (%2).",
-+                    "Warning",
-+                    0,
-+                    {},
-+                    "None.",
-+                }},
++        "BMCTimeNotUpdatedViaNTP",
++        {
++            "Indicates that time was restored from recorded timestamp.",
++            "BMC timed out waiting for reply from NTP server: %1 (%2).",
++            "Warning",
++            0,
++            {},
++            "None.",
++        }},
  
  };
  } // namespace redfish::registries::openbmc
diff --git a/meta-ibs/meta-common/recipes-phosphor/interfaces/bmcweb/0009-Added-additional-log-about-NTP-sync-status.patch b/meta-ibs/meta-common/recipes-phosphor/interfaces/bmcweb/0009-Added-additional-log-about-NTP-sync-status.patch
index ef6514e48d..b7d242735b 100644
--- a/meta-ibs/meta-common/recipes-phosphor/interfaces/bmcweb/0009-Added-additional-log-about-NTP-sync-status.patch
+++ b/meta-ibs/meta-common/recipes-phosphor/interfaces/bmcweb/0009-Added-additional-log-about-NTP-sync-status.patch
@@ -1,6 +1,6 @@
-From 1b4c6999fa854fa947e9b91e1bdfff22abc541ef Mon Sep 17 00:00:00 2001
+From c35ca25a87746e81541f442824faaac52a3c7341 Mon Sep 17 00:00:00 2001
 From: Nikita Kosenkov <NKosenkov@IBS.RU>
-Date: Tue, 23 Aug 2022 10:09:10 +0300
+Date: Tue, 6 Sep 2022 15:21:34 +0300
 Subject: [PATCH] Added additional log about NTP synchronization status
 
 ---
@@ -8,31 +8,31 @@ Subject: [PATCH] Added additional log about NTP synchronization status
  1 file changed, 11 insertions(+), 1 deletion(-)
 
 diff --git a/redfish-core/include/registries/openbmc_message_registry.hpp b/redfish-core/include/registries/openbmc_message_registry.hpp
-index 2b8d476c..3199412e 100644
+index 6dd467e8..33058a80 100644
 --- a/redfish-core/include/registries/openbmc_message_registry.hpp
 +++ b/redfish-core/include/registries/openbmc_message_registry.hpp
-@@ -2290,13 +2290,23 @@ constexpr std::array registry = {
+@@ -2331,13 +2331,23 @@ constexpr std::array registry = {
      MessageEntry{
-                 "BMCTimeNotUpdatedViaNTP",
-                 {
--                    "Indicates that time was restored from recorded timestamp.",
-+                    "Indicates that timed out waiting for reply from NTP server.",
-                     "BMC timed out waiting for reply from NTP server: %1 (%2).",
-                     "Warning",
-                     0,
-                     {},
-                     "None.",
-                 }},
+         "BMCTimeNotUpdatedViaNTP",
+         {
+-            "Indicates that time was restored from recorded timestamp.",
++            "Indicates that timed out waiting for reply from NTP server.",
+             "BMC timed out waiting for reply from NTP server: %1 (%2).",
+             "Warning",
+             0,
+             {},
+             "None.",
+         }},
 +    MessageEntry{
-+                "BMCTimeNotResolvedNTPServers",
-+                {
-+                    "Indicates that failed to resolve NTP server addresses.",
-+                    "BMC Failed to resolve NTP server addresses.",
-+                    "Warning",
-+                    0,
-+                    {},
-+                    "None.",
-+                }},
++        "BMCTimeNotResolvedNTPServers",
++        {
++            "Indicates that failed to resolve NTP server addresses.",
++            "BMC Failed to resolve NTP server addresses.",
++            "Warning",
++            0,
++            {},
++            "None.",
++        }},
  
  };
  } // namespace redfish::registries::openbmc
diff --git a/meta-ibs/meta-common/recipes-phosphor/interfaces/bmcweb/0011-Added-check-user-priv-before-creating-KVM-and-SOL.patch b/meta-ibs/meta-common/recipes-phosphor/interfaces/bmcweb/0010-Added-check-user-priv-before-creating-KVM-and-SOL.patch
index 95be56db0f..ef29193670 100644
--- a/meta-ibs/meta-common/recipes-phosphor/interfaces/bmcweb/0011-Added-check-user-priv-before-creating-KVM-and-SOL.patch
+++ b/meta-ibs/meta-common/recipes-phosphor/interfaces/bmcweb/0010-Added-check-user-priv-before-creating-KVM-and-SOL.patch
@@ -1,16 +1,15 @@
-From fc68d0a7de824044a824963a7144a35166b669d1 Mon Sep 17 00:00:00 2001
+From 6c7424970da146290ea9fe0aacb3d75bc43bf063 Mon Sep 17 00:00:00 2001
 From: Nikita Kosenkov <NKosenkov@IBS.RU>
-Date: Fri, 2 Sep 2022 16:53:55 +0300
+Date: Tue, 6 Sep 2022 15:43:17 +0300
 Subject: [PATCH] Added check the user priv before creating KVM and SOL
- sessions
 
 ---
- include/kvm_websocket.hpp | 73 +++++++++++++++++++++++++++++----
+ include/kvm_websocket.hpp | 72 ++++++++++++++++++++++++++++----
  include/obmc_console.hpp  | 86 ++++++++++++++++++++++++++++++++-------
- 2 files changed, 137 insertions(+), 22 deletions(-)
+ 2 files changed, 136 insertions(+), 22 deletions(-)
 
 diff --git a/include/kvm_websocket.hpp b/include/kvm_websocket.hpp
-index 79975d2c..1c5a47cf 100644
+index 79975d2c..186b8271 100644
 --- a/include/kvm_websocket.hpp
 +++ b/include/kvm_websocket.hpp
 @@ -4,7 +4,9 @@
@@ -23,7 +22,7 @@ index 79975d2c..1c5a47cf 100644
  
  namespace crow
  {
-@@ -162,15 +164,72 @@ inline void requestRoutes(App& app)
+@@ -162,15 +164,71 @@ inline void requestRoutes(App& app)
          .privileges({{"ConfigureComponents", "ConfigureManager"}})
          .websocket()
          .onopen([](crow::websocket::Connection& conn) {
@@ -79,7 +78,7 @@ index 79975d2c..1c5a47cf 100644
 +                                 << " not authorized for kvm connection";
 +
 +                        conn.close("Unathourized access");
-+                        
++
 +                        return;
 +                    }
 +
@@ -92,19 +91,18 @@ index 79975d2c..1c5a47cf 100644
 +                    }
 +                    sessions[&conn] = std::make_unique<KvmSession>(conn);
 +                }
-+                
+ 
+-            sessions[&conn] = std::make_unique<KvmSession>(conn);
 +            },
 +            "xyz.openbmc_project.User.Manager",
 +            "/xyz/openbmc_project/user",
 +            "xyz.openbmc_project.User.Manager", "GetUserInfo",
 +            conn.getUserName());
- 
--            sessions[&conn] = std::make_unique<KvmSession>(conn);
          })
          .onclose([](crow::websocket::Connection& conn, const std::string&) {
              sessions.erase(&conn);
 diff --git a/include/obmc_console.hpp b/include/obmc_console.hpp
-index d5eaf819..83e19621 100644
+index d5eaf819..84115b4f 100644
 --- a/include/obmc_console.hpp
 +++ b/include/obmc_console.hpp
 @@ -117,21 +117,77 @@ inline void requestRoutes(App& app)
@@ -173,7 +171,7 @@ index d5eaf819..83e19621 100644
 +                                 << " not authorized for obmc console connection";
 +
 +                        conn.close("Unathourized access");
-+                        
++
 +                        return;
 +                    }
 +
@@ -191,7 +189,7 @@ index d5eaf819..83e19621 100644
 +                        hostSocket->async_connect(ep, connectHandler);
 +                    }
 +                }
-+                
++
 +            },
 +            "xyz.openbmc_project.User.Manager",
 +            "/xyz/openbmc_project/user",
diff --git a/meta-ibs/meta-common/recipes-phosphor/interfaces/bmcweb/0010-Fix-coreCount-in-ProcessorSummary.patch b/meta-ibs/meta-common/recipes-phosphor/interfaces/bmcweb/0010-Fix-coreCount-in-ProcessorSummary.patch
deleted file mode 100644
index e2957b8c25..0000000000
--- a/meta-ibs/meta-common/recipes-phosphor/interfaces/bmcweb/0010-Fix-coreCount-in-ProcessorSummary.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 1f9544214a1a02a3a2db2e22cebb1ffc0e2c2e9e Mon Sep 17 00:00:00 2001
-From: Nikita Kosenkov <NKosenkov@IBS.RU>
-Date: Mon, 29 Aug 2022 11:51:16 +0300
-Subject: [PATCH] Fix coreCount in ProcessorSummary
-
----
- redfish-core/lib/systems.hpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/redfish-core/lib/systems.hpp b/redfish-core/lib/systems.hpp
-index d21389a5..1880062b 100644
---- a/redfish-core/lib/systems.hpp
-+++ b/redfish-core/lib/systems.hpp
-@@ -188,7 +188,7 @@ inline void
- 
-             if (coreCountPtr == nullptr)
-             {
--                coreCount = 0;
-+                coreCount = *coreCountVal;
-             }
-             else
-             {
--- 
-2.35.1
-
diff --git a/meta-ibs/meta-common/recipes-phosphor/interfaces/bmcweb_%.bbappend b/meta-ibs/meta-common/recipes-phosphor/interfaces/bmcweb_%.bbappend
index 9b58e58b37..cb5ddee99e 100644
--- a/meta-ibs/meta-common/recipes-phosphor/interfaces/bmcweb_%.bbappend
+++ b/meta-ibs/meta-common/recipes-phosphor/interfaces/bmcweb_%.bbappend
@@ -1,20 +1,21 @@
 FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
-SRCREV = "a170f2756716f13d906678ab93351ead035e37b4"
+SRCREV = "3e7ab70817a6e49684c7c01ec0f2d67630f36559"
 
 SRC_URI += "\
     file://0001-Enable-vm-nbdproxy-option.patch \
-    file://0002-Add-http-ftp-nfs-protocols-to-un-filter-them-FT-58-T.patch \
+    file://0002-Add-http-ftp-nfs-protocols.patch \
     file://0003-Revert-Rearrange-forward_unauthorized.patch \
     file://0004-IBS-Add-redfish2phosphor-logs.patch \
-    file://0005-Add-Sensor-Warning-Threshold-Edit.patch \
     file://0006-IBS-bmcweb-evt-registry-add-BMCTimeUpdatedViaNTP.patch \
-    file://0007-Add-critical-thresholds-to-redfish.patch \
     file://0008-Add-additional-logs-about-time-sync.patch \
     file://0009-Added-additional-log-about-NTP-sync-status.patch \
-    file://0010-Fix-coreCount-in-ProcessorSummary.patch \
-    file://0011-Added-check-user-priv-before-creating-KVM-and-SOL.patch \
+    file://0010-Added-check-user-priv-before-creating-KVM-and-SOL.patch \
     "
+#SRC_URI += "\
+#    file://0005-Add-Sensor-Warning-Threshold-Edit.patch \
+#    file://0007-Add-critical-thresholds-to-redfish.patch \
+#    "
 
 EXTRA_OEMESON += "\
     -Dredfish-cpu-log=enabled \
diff --git a/meta-ibs/meta-cp2-5422/recipes-phosphor/interfaces/bmcweb/0001-IBS-Default-BMC-Name-and-Model.patch b/meta-ibs/meta-cp2-5422/recipes-phosphor/interfaces/bmcweb/0001-IBS-Default-BMC-Name-and-Model.patch
index cf74d8c28c..ae82fb562e 100644
--- a/meta-ibs/meta-cp2-5422/recipes-phosphor/interfaces/bmcweb/0001-IBS-Default-BMC-Name-and-Model.patch
+++ b/meta-ibs/meta-cp2-5422/recipes-phosphor/interfaces/bmcweb/0001-IBS-Default-BMC-Name-and-Model.patch
@@ -1,6 +1,6 @@
-From cfef198e816222d960cc003e3717bb9d79a89d60 Mon Sep 17 00:00:00 2001
+From c80dd7a21e9398f5672ff161bf473b2c5ddcf0c1 Mon Sep 17 00:00:00 2001
 From: "Andrey V.Kosteltsev" <AKosteltsev@IBS.RU>
-Date: Tue, 12 Jul 2022 12:09:23 +0300
+Date: Tue, 6 Sep 2022 16:15:10 +0300
 Subject: [PATCH] IBS: Default BMC Name and Model
 
 ---
@@ -8,10 +8,10 @@ Subject: [PATCH] IBS: Default BMC Name and Model
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/redfish-core/lib/managers.hpp b/redfish-core/lib/managers.hpp
-index d1e43fb44..446a53dfc 100644
+index f934fd6f..d69bab27 100644
 --- a/redfish-core/lib/managers.hpp
 +++ b/redfish-core/lib/managers.hpp
-@@ -1959,7 +1959,7 @@ inline void requestRoutesManager(App& app)
+@@ -1928,7 +1928,7 @@ inline void requestRoutesManager(App& app)
          asyncResp->res.jsonValue["@odata.id"] = "/redfish/v1/Managers/bmc";
          asyncResp->res.jsonValue["@odata.type"] = "#Manager.v1_14_0.Manager";
          asyncResp->res.jsonValue["Id"] = "bmc";
@@ -20,7 +20,7 @@ index d1e43fb44..446a53dfc 100644
          asyncResp->res.jsonValue["Description"] =
              "Baseboard Management Controller";
          asyncResp->res.jsonValue["PowerState"] = "On";
-@@ -1969,7 +1969,7 @@ inline void requestRoutesManager(App& app)
+@@ -1938,7 +1938,7 @@ inline void requestRoutesManager(App& app)
          asyncResp->res.jsonValue["ManagerType"] = "BMC";
          asyncResp->res.jsonValue["UUID"] = systemd_utils::getUuid();
          asyncResp->res.jsonValue["ServiceEntryPointUUID"] = uuid;
diff --git a/meta-ibs/meta-cp2-5422/recipes-phosphor/interfaces/bmcweb_%.bbappend b/meta-ibs/meta-cp2-5422/recipes-phosphor/interfaces/bmcweb_%.bbappend
index 29a8481044..69ce3be11a 100644
--- a/meta-ibs/meta-cp2-5422/recipes-phosphor/interfaces/bmcweb_%.bbappend
+++ b/meta-ibs/meta-cp2-5422/recipes-phosphor/interfaces/bmcweb_%.bbappend
@@ -2,17 +2,21 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
 SRC_URI += "\
     file://0001-IBS-Default-BMC-Name-and-Model.patch \
-    file://0002-add-new-cpu-fields.patch \
-    file://0003-add-new-dimm-fields.patch \
-    file://0004-configure-telemetry.patch \
-    file://0005-Fix-keep-and-re-send-initial-negotiation-data-from-W.patch \
-    file://0006-fix-bug-empty-pcie-functions.patch \
-    file://0007-Removed-non-working-boot-override-modes.patch \
-    file://0008-Add-pcie-device-names.patch \
-    file://0009-fix-circular-buffer-telemetry.patch \
-    file://00010-Add-smtp-client.patch \
     "
 
+#SRC_URI += "\
+#    file://0001-IBS-Default-BMC-Name-and-Model.patch \
+#    file://0002-add-new-cpu-fields.patch \
+#    file://0003-add-new-dimm-fields.patch \
+#    file://0004-configure-telemetry.patch \
+#    file://0005-Fix-keep-and-re-send-initial-negotiation-data-from-W.patch \
+#    file://0006-fix-bug-empty-pcie-functions.patch \
+#    file://0007-Removed-non-working-boot-override-modes.patch \
+#    file://0008-Add-pcie-device-names.patch \
+#    file://0009-fix-circular-buffer-telemetry.patch \
+#    file://00010-Add-smtp-client.patch \
+#    "
+
 EXTRA_OEMESON += "\
     -Dredfish-host-logger=enabled \
     -Dredfish-dump-log=enabled \