pseq: Move bus/addr higher in class hierarchy
Update the PowerSequencerDevice class hierarchy within the
phosphor-power-sequencer application.
The I2C bus and address for the power sequencer device(s) in the system
are now defined in the JSON configuration file.
Move the I2C bus and address properties to the top of the
PowerSequencerDevice class hierarchy.
For sub-classes that already had these properties, order the constructor
parameters to match the order in the JSON.
Tested:
* Ran automated test cases
Change-Id: Ida6886cbc62a9c8abd3bed294f6ddcd1851ccd62
Signed-off-by: Shawn McCarney <shawnmm@us.ibm.com>
diff --git a/phosphor-power-sequencer/test/mock_device.hpp b/phosphor-power-sequencer/test/mock_device.hpp
index 7140f65..7edd3ae 100644
--- a/phosphor-power-sequencer/test/mock_device.hpp
+++ b/phosphor-power-sequencer/test/mock_device.hpp
@@ -17,6 +17,8 @@
#include "power_sequencer_device.hpp"
+#include <cstdint>
+
#include <gmock/gmock.h>
namespace phosphor::power::sequencer
@@ -39,6 +41,8 @@
virtual ~MockDevice() = default;
MOCK_METHOD(const std::string&, getName, (), (const, override));
+ MOCK_METHOD(uint8_t, getBus, (), (const, override));
+ MOCK_METHOD(uint16_t, getAddress, (), (const, override));
MOCK_METHOD(const std::vector<std::unique_ptr<Rail>>&, getRails, (),
(const, override));
MOCK_METHOD(std::vector<int>, getGPIOValues, (Services & services),