style: comply with OpenBMC style guidelines
Change-Id: I72f86c59a0502777c861de901907c0a556c4c6c5
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
diff --git a/src/test/util/association_objects.hpp b/src/test/util/association_objects.hpp
index 632e5ff..f6b6d1d 100644
--- a/src/test/util/association_objects.hpp
+++ b/src/test/util/association_objects.hpp
@@ -1,22 +1,22 @@
#include "src/associations.hpp"
#include "src/processing.hpp"
-const std::string DEFAULT_SOURCE_PATH = "/logging/entry/1";
-const std::string DEFAULT_DBUS_SVC = "xyz.openbmc_project.New.Interface";
-const std::string DEFAULT_FWD_PATH = {DEFAULT_SOURCE_PATH + "/" + "inventory"};
-const std::string DEFAULT_ENDPOINT =
+const std::string defaultSourcePath = "/logging/entry/1";
+const std::string defaultDbusSvc = "xyz.openbmc_project.New.Interface";
+const std::string defaultFwdPath = {defaultSourcePath + "/" + "inventory"};
+const std::string defaultEndpoint =
"/xyz/openbmc_project/inventory/system/chassis";
-const std::string DEFAULT_REV_PATH = {DEFAULT_ENDPOINT + "/" + "error"};
-const std::string EXTRA_ENDPOINT = "/xyz/openbmc_project/differnt/endpoint";
+const std::string defaultRevPath = {defaultEndpoint + "/" + "error"};
+const std::string extraEndpoint = "/xyz/openbmc_project/differnt/endpoint";
// Create a default AssociationOwnersType object
AssociationOwnersType createDefaultOwnerAssociation()
{
- AssociationPaths assocPathMap = {{DEFAULT_FWD_PATH, {DEFAULT_ENDPOINT}},
- {DEFAULT_REV_PATH, {DEFAULT_SOURCE_PATH}}};
+ AssociationPaths assocPathMap = {{defaultFwdPath, {defaultEndpoint}},
+ {defaultRevPath, {defaultSourcePath}}};
boost::container::flat_map<std::string, AssociationPaths> serviceMap = {
- {DEFAULT_DBUS_SVC, assocPathMap}};
- AssociationOwnersType ownerAssoc = {{DEFAULT_SOURCE_PATH, serviceMap}};
+ {defaultDbusSvc, assocPathMap}};
+ AssociationOwnersType ownerAssoc = {{defaultSourcePath, serviceMap}};
return ownerAssoc;
}
@@ -26,15 +26,15 @@
{
AssociationInterfaces interfaceAssoc;
- auto& iface = interfaceAssoc[DEFAULT_FWD_PATH];
+ auto& iface = interfaceAssoc[defaultFwdPath];
auto& endpoints = std::get<endpointsPos>(iface);
- endpoints.push_back(DEFAULT_ENDPOINT);
- server->add_interface(DEFAULT_FWD_PATH, DEFAULT_DBUS_SVC);
+ endpoints.push_back(defaultEndpoint);
+ server->add_interface(defaultFwdPath, defaultDbusSvc);
- auto& iface2 = interfaceAssoc[DEFAULT_REV_PATH];
+ auto& iface2 = interfaceAssoc[defaultRevPath];
auto& endpoints2 = std::get<endpointsPos>(iface2);
- endpoints2.push_back(DEFAULT_SOURCE_PATH);
- server->add_interface(DEFAULT_REV_PATH, DEFAULT_DBUS_SVC);
+ endpoints2.push_back(defaultSourcePath);
+ server->add_interface(defaultRevPath, defaultDbusSvc);
return interfaceAssoc;
}
@@ -42,30 +42,30 @@
// Just add an extra endpoint to the first association
void addEndpointToInterfaceAssociation(AssociationInterfaces& interfaceAssoc)
{
- auto iface = interfaceAssoc[DEFAULT_FWD_PATH];
+ auto iface = interfaceAssoc[defaultFwdPath];
auto endpoints = std::get<endpointsPos>(iface);
- endpoints.push_back(EXTRA_ENDPOINT);
+ endpoints.push_back(extraEndpoint);
}
-// Create a default interface_map_type with input values
-interface_map_type createInterfaceMap(
- const std::string& path, const std::string& connection_name,
- const boost::container::flat_set<std::string>& interface_names)
+// Create a default interfaceMapType with input values
+InterfaceMapType createInterfaceMap(
+ const std::string& path, const std::string& connectionName,
+ const boost::container::flat_set<std::string>& interfaceNames)
{
boost::container::flat_map<std::string,
boost::container::flat_set<std::string>>
- connectionMap = {{connection_name, interface_names}};
- interface_map_type interfaceMap = {{path, connectionMap}};
+ connectionMap = {{connectionName, interfaceNames}};
+ InterfaceMapType interfaceMap = {{path, connectionMap}};
return interfaceMap;
}
-// Create a default interface_map_type with 2 entries with the same
+// Create a default interfaceMapType with 2 entries with the same
// owner.
-interface_map_type createDefaultInterfaceMap()
+InterfaceMapType createDefaultInterfaceMap()
{
- interface_map_type interfaceMap = {
- {DEFAULT_SOURCE_PATH, {{DEFAULT_DBUS_SVC, {"a"}}}},
- {DEFAULT_ENDPOINT, {{DEFAULT_DBUS_SVC, {"b"}}}}};
+ InterfaceMapType interfaceMap = {
+ {defaultSourcePath, {{defaultDbusSvc, {"a"}}}},
+ {defaultEndpoint, {{defaultDbusSvc, {"b"}}}}};
return interfaceMap;
}
diff --git a/src/test/util/debug_output.hpp b/src/test/util/debug_output.hpp
index 460f01f..3cdf42b 100644
--- a/src/test/util/debug_output.hpp
+++ b/src/test/util/debug_output.hpp
@@ -4,7 +4,7 @@
// Some debug functions for dumping out the main data structures in objmgr
-void dump_AssociationOwnersType(AssociationOwnersType& assocOwners)
+void dumpAssociationOwnersType(AssociationOwnersType& assocOwners)
{
using namespace std;
cout << "##### AssociationOwnersType #####" << endl;
@@ -31,7 +31,7 @@
}
}
-void dump_AssociationInterfaces(AssociationInterfaces& assocInterfaces)
+void dumpAssociationInterfaces(AssociationInterfaces& assocInterfaces)
{
using namespace std;
cout << "##### AssociationInterfaces #####" << endl;
@@ -49,10 +49,10 @@
}
}
-void dump_InterfaceMapType(interface_map_type& intfMap)
+void dumpInterfaceMapType(InterfaceMapType& intfMap)
{
using namespace std;
- cout << "##### interface_map_type #####" << endl;
+ cout << "##### interfaceMapType #####" << endl;
for (auto i : intfMap)
{
cout << "------------------------------------" << endl;