manager: Remove odata.context
Redfish made odata.context optional (1.6.0 of DSP0266) and
has removed odata.context from example payloads in the
specification (1.7.0 of DSP0266), removed it from the mockups,
and Redfish recommended not using.
Change-Id: I1a229e996b30b4223036c58a111e4c3ab4b749c6
Signed-off-by: Gunnar Mills <gmills@us.ibm.com>
diff --git a/redfish-core/lib/managers.hpp b/redfish-core/lib/managers.hpp
index 1d9c5a8..a000bba 100644
--- a/redfish-core/lib/managers.hpp
+++ b/redfish-core/lib/managers.hpp
@@ -147,22 +147,16 @@
asyncResp->res.jsonValue["Oem"]["OpenBmc"]["Fan"];
nlohmann::json& fans = configRoot["FanControllers"];
fans["@odata.type"] = "#OemManager.FanControllers";
- fans["@odata.context"] =
- "/redfish/v1/$metadata#OemManager.FanControllers";
fans["@odata.id"] = "/redfish/v1/Managers/bmc#/Oem/OpenBmc/"
"Fan/FanControllers";
nlohmann::json& pids = configRoot["PidControllers"];
pids["@odata.type"] = "#OemManager.PidControllers";
- pids["@odata.context"] =
- "/redfish/v1/$metadata#OemManager.PidControllers";
pids["@odata.id"] =
"/redfish/v1/Managers/bmc#/Oem/OpenBmc/Fan/PidControllers";
nlohmann::json& stepwise = configRoot["StepwiseControllers"];
stepwise["@odata.type"] = "#OemManager.StepwiseControllers";
- stepwise["@odata.context"] =
- "/redfish/v1/$metadata#OemManager.StepwiseControllers";
stepwise["@odata.id"] =
"/redfish/v1/Managers/bmc#/Oem/OpenBmc/Fan/StepwiseControllers";
@@ -170,13 +164,9 @@
zones["@odata.id"] =
"/redfish/v1/Managers/bmc#/Oem/OpenBmc/Fan/FanZones";
zones["@odata.type"] = "#OemManager.FanZones";
- zones["@odata.context"] =
- "/redfish/v1/$metadata#OemManager.FanZones";
configRoot["@odata.id"] =
"/redfish/v1/Managers/bmc#/Oem/OpenBmc/Fan";
configRoot["@odata.type"] = "#OemManager.Fan";
- configRoot["@odata.context"] =
- "/redfish/v1/$metadata#OemManager.Fan";
configRoot["Profile@Redfish.AllowableValues"] = supportedProfiles;
if (!currentProfile.empty())
@@ -258,8 +248,6 @@
"OpenBmc/Fan/FanZones/" +
name;
zone["@odata.type"] = "#OemManager.FanZone";
- zone["@odata.context"] =
- "/redfish/v1/$metadata#OemManager.FanZone";
config = &zone;
}
@@ -282,9 +270,6 @@
controller["@odata.type"] =
"#OemManager.StepwiseController";
- controller["@odata.context"] =
- "/redfish/v1/"
- "$metadata#OemManager.StepwiseController";
controller["Direction"] = *classPtr;
}
@@ -310,10 +295,6 @@
name;
element["@odata.type"] =
"#OemManager.FanController";
-
- element["@odata.context"] =
- "/redfish/v1/"
- "$metadata#OemManager.FanController";
}
else
{
@@ -323,9 +304,6 @@
name;
element["@odata.type"] =
"#OemManager.PidController";
- element["@odata.context"] =
- "/redfish/v1/$metadata"
- "#OemManager.PidController";
}
}
else
@@ -1588,8 +1566,6 @@
{
res.jsonValue["@odata.id"] = "/redfish/v1/Managers/bmc";
res.jsonValue["@odata.type"] = "#Manager.v1_3_0.Manager";
- res.jsonValue["@odata.context"] =
- "/redfish/v1/$metadata#Manager.Manager";
res.jsonValue["Id"] = "bmc";
res.jsonValue["Name"] = "OpenBmc Manager";
res.jsonValue["Description"] = "Baseboard Management Controller";
@@ -1619,11 +1595,8 @@
nlohmann::json& oemOpenbmc = oem["OpenBmc"];
oem["@odata.type"] = "#OemManager.Oem";
oem["@odata.id"] = "/redfish/v1/Managers/bmc#/Oem";
- oem["@odata.context"] = "/redfish/v1/$metadata#OemManager.Oem";
oemOpenbmc["@odata.type"] = "#OemManager.OpenBmc";
oemOpenbmc["@odata.id"] = "/redfish/v1/Managers/bmc#/Oem/OpenBmc";
- oemOpenbmc["@odata.context"] =
- "/redfish/v1/$metadata#OemManager.OpenBmc";
oemOpenbmc["Certificates"] = {
{"@odata.id", "/redfish/v1/Managers/bmc/Truststore/Certificates"}};
@@ -1829,8 +1802,6 @@
// because it has a duplicate entry for members
res.jsonValue["@odata.id"] = "/redfish/v1/Managers";
res.jsonValue["@odata.type"] = "#ManagerCollection.ManagerCollection";
- res.jsonValue["@odata.context"] =
- "/redfish/v1/$metadata#ManagerCollection.ManagerCollection";
res.jsonValue["Name"] = "Manager Collection";
res.jsonValue["Members@odata.count"] = 1;
res.jsonValue["Members"] = {