Rename OemVirtualMedia to OpenBMCVirtualMedia
Per the redfish spec, we should be naming these schemas correctly
Rename OemVirtualMedia -> OpenBMCVirtualMedia.
Tested:
These are only enabled when the option flag nbd-proxy is enabled, which
is commented out. Code inspection only.
Change-Id: Ic94025e2125e5b44e09637024acf9b80897328bd
Signed-off-by: Ed Tanous <ed@tanous.net>
diff --git a/redfish-core/lib/virtual_media.hpp b/redfish-core/lib/virtual_media.hpp
index 37fb204..6e4be6d 100644
--- a/redfish-core/lib/virtual_media.hpp
+++ b/redfish-core/lib/virtual_media.hpp
@@ -259,7 +259,7 @@
item["MediaTypes"] = nlohmann::json::array_t({"CD", "USBStick"});
item["TransferMethod"] = "Stream";
item["Oem"]["OpenBMC"]["@odata.type"] =
- "#OemVirtualMedia.v1_0_0.VirtualMedia";
+ "#OpenBMCVirtualMedia.v1_0_0.VirtualMedia";
item["Oem"]["OpenBMC"]["@odata.id"] = boost::urls::format(
"/redfish/v1/Managers/{}/VirtualMedia/{}#/Oem/OpenBMC", name, resName);
diff --git a/redfish-core/schema/oem/openbmc/csdl/OemVirtualMedia_v1.xml b/redfish-core/schema/oem/openbmc/csdl/OpenBMCVirtualMedia_v1.xml
similarity index 97%
rename from redfish-core/schema/oem/openbmc/csdl/OemVirtualMedia_v1.xml
rename to redfish-core/schema/oem/openbmc/csdl/OpenBMCVirtualMedia_v1.xml
index 8bc6224..1ab2b23 100644
--- a/redfish-core/schema/oem/openbmc/csdl/OemVirtualMedia_v1.xml
+++ b/redfish-core/schema/oem/openbmc/csdl/OpenBMCVirtualMedia_v1.xml
@@ -17,11 +17,11 @@
<edmx:DataServices>
- <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="OemVirtualMedia">
+ <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="OpenBMCVirtualMedia">
<Annotation Term="Redfish.OwningEntity" String="OpenBMC"/>
</Schema>
- <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="OemVirtualMedia.v1_0_0">
+ <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="OpenBMCVirtualMedia.v1_0_0">
<Annotation Term="Redfish.OwningEntity" String="OpenBMC"/>
<Annotation Term="Redfish.Release" String="1.0"/>
diff --git a/redfish-core/schema/oem/openbmc/json-schema/OpenBMCVirtualMedia.json b/redfish-core/schema/oem/openbmc/json-schema/OpenBMCVirtualMedia.json
new file mode 100644
index 0000000..f8bad9a
--- /dev/null
+++ b/redfish-core/schema/oem/openbmc/json-schema/OpenBMCVirtualMedia.json
@@ -0,0 +1,8 @@
+{
+ "$id": "https://github.com/openbmc/bmcweb/tree/master/static/redfish/v1/JsonSchemasOpenBMCVirtualMedia.json",
+ "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
+ "copyright": "Copyright 2023 OpenBMC.",
+ "definitions": {},
+ "owningEntity": "OpenBMC",
+ "title": "#OpenBMCVirtualMedia"
+}
diff --git a/redfish-core/schema/oem/openbmc/json-schema/OemVirtualMedia.json b/redfish-core/schema/oem/openbmc/json-schema/OpenBMCVirtualMedia.v1_0_0.json
similarity index 84%
rename from redfish-core/schema/oem/openbmc/json-schema/OemVirtualMedia.json
rename to redfish-core/schema/oem/openbmc/json-schema/OpenBMCVirtualMedia.v1_0_0.json
index 9f30ad0..0663f2a 100644
--- a/redfish-core/schema/oem/openbmc/json-schema/OemVirtualMedia.json
+++ b/redfish-core/schema/oem/openbmc/json-schema/OpenBMCVirtualMedia.v1_0_0.json
@@ -1,7 +1,7 @@
{
- "$id": "http://redfish.dmtf.org/schemas/v1/OemVirtualMedia.v1_0_0.json",
+ "$id": "https://github.com/openbmc/bmcweb/tree/master/static/redfish/v1/JsonSchemasOpenBMCVirtualMedia.v1_0_0.json",
"$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
- "copyright": "Copyright 2014-2019 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
+ "copyright": "Copyright 2023 OpenBMC.",
"definitions": {
"VirtualMedia": {
"additionalProperties": false,
@@ -34,5 +34,5 @@
},
"owningEntity": "OpenBMC",
"release": "1.0",
- "title": "#OemVirtualMedia.v1_0_0"
+ "title": "#OpenBMCVirtualMedia.v1_0_0"
}
diff --git a/redfish-core/schema/oem/openbmc/meson.build b/redfish-core/schema/oem/openbmc/meson.build
index 40d5b54..32a3211 100644
--- a/redfish-core/schema/oem/openbmc/meson.build
+++ b/redfish-core/schema/oem/openbmc/meson.build
@@ -3,7 +3,7 @@
'insecure-disable-auth': 'OpenBMCAccountService',
'redfish-oem-manager-fan-data': 'OpenBMCManager',
'redfish-provisioning-feature': 'OemComputerSystem',
- #'vm-nbdproxy': 'OemVirtualMedia',
+ #'vm-nbdproxy': 'OpenBMCVirtualMedia',
}
foreach option_key, schema : schemas