sdbusplus/tools, branch master

Emit adding/removing interfaces for object server

2020-02-13T06:49:15+00:00

The object server currently either creats the objects and interfaces, or defer the signal by not adding objects. In practice, we have situations that the code would like to add interfaces to an existing object, and it's not supported, or needs tricky code to workaround. Exmaples: https://gerrit.openbmc-project.xyz/c/openbmc/phosphor-bmc-code-mgmt/+/5820 https://gerrit.openbmc-project.xyz/c/openbmc/openpower-pnor-code-mgmt/+/5346 This commit adds the support by: 1. Adding emit_added() in interface.hpp and the generated server.hpp 2. Adding a enum class in object's constructor to indicate which action to do, to create the object, or adding the interface, or defer signal as before. So the user of object<> could pass `action::emit_interface_added` to the constructor to tell the object server *only* emit interface added to DBus, without emitting object added. The previous code stays the same behavior: * If `true` is passed in object's constructor, it defers emitting object added signal; * If no extra parameter is passed in object's constructor, it emits object added signal as before. Tested: 1. Make sure the openbmc builds fine with https://gerrit.openbmc-project.xyz/c/openbmc/phosphor-logging/+/25089 because phosphor-logging uses its own server.hpp for interface, the above patch removes that. 2. Manually write a small service to verify the interfaces are added and removed by using the `emit_interface_added` action. 3. Added the unit test cases for object.hpp to check the ctor/dtor with different actions. Signed-off-by: Lei YU Change-Id: I178c5bed3c9ff39ee2ac8d143fbe9131b0753dfa

sdbus++: interface: fix indent of enum-string fn

2020-02-11T02:49:21+00:00

The convertFromString functions were indented incorrectly relative to the rest of the class. Signed-off-by: Patrick Williams Change-Id: Iabe9d30c33c8707bf2bf4c6a697e3d27d0a3000b

Make interface string public

2020-02-04T06:57:31+00:00

The interface string was private, and the users of sdbusplus have to define their own strings for the D-Bus interfaces. By making the interface string public, users do not have to define their own and the generated string could be used instead. E.g. one could directly use "Calculator::interface" instead of "net.poettering.Calculator" in the example. Signed-off-by: Lei YU Change-Id: I0846d4e0609c8588d81e8a19bdd69fd79df83848

sdbus++: Fix construction of objects with flags

2019-05-23T18:42:34+00:00

Objects don't take kwargs for their constructors so don't call the object constructor with kwargs ``` | Traceback (most recent call last): | File "/home/spirit/src/vesnin/openbmc-alternate/build/tmp/work/armv5e-openbmc-linux-gnueabi/phosphor-dbus-interfaces/1.0-r1/recipe-sysroot-native/usr/bin/sdbus++", line 50, in | main() | File "/home/spirit/src/vesnin/openbmc-alternate/build/tmp/work/armv5e-openbmc-linux-gnueabi/phosphor-dbus-interfaces/1.0-r1/recipe-sysroot-native/usr/bin/sdbus++", line 45, in main | instance = valid_types[args.typeName].load(args.item, args.rootdir) | File "/home/spirit/src/vesnin/openbmc-alternate/build/tmp/work/armv5e-openbmc-linux-gnueabi/phosphor-dbus-interfaces/1.0-r1/recipe-sysroot-native/usr/lib/python2.7/site-packages/sdbusplus/interface.py", line 21, in load | return Interface(**y) | File "/home/spirit/src/vesnin/openbmc-alternate/build/tmp/work/armv5e-openbmc-linux-gnueabi/phosphor-dbus-interfaces/1.0-r1/recipe-sysroot-native/usr/lib/python2.7/site-packages/sdbusplus/interface.py", line 25, in __init__ | [Property(**p) for p in kwargs.pop('properties', [])] | File "/home/spirit/src/vesnin/openbmc-alternate/build/tmp/work/armv5e-openbmc-linux-gnueabi/phosphor-dbus-interfaces/1.0-r1/recipe-sysroot-native/usr/lib/python2.7/site-packages/sdbusplus/property.py", line 12, in __init__ | super(Property, self).__init__(**kwargs) | File "/home/spirit/src/vesnin/openbmc-alternate/build/tmp/work/armv5e-openbmc-linux-gnueabi/phosphor-dbus-interfaces/1.0-r1/recipe-sysroot-native/usr/lib/python2.7/site-packages/sdbusplus/namedelement.py", line 8, in __init__ | super(NamedElement, self).__init__(**kwargs) | File "/home/spirit/src/vesnin/openbmc-alternate/build/tmp/work/armv5e-openbmc-linux-gnueabi/phosphor-dbus-interfaces/1.0-r1/recipe-sysroot-native/usr/lib/python2.7/site-packages/sdbusplus/renderer.py", line 3, in __init__ | super(Renderer, self).__init__(**kwargs) | TypeError: object.__init__() takes no parameters ``` Fixes openbmc/sdbusplus#30 Tested: Ran with some locally modified properties marked as const. Verified that the generated code marks those as const and removes their setter Change-Id: I94965add8588a8a3168662e00ef2502276440ee5 Signed-off-by: William A. Kennington III

std::variant: Remove uses of the variant_ns

2019-04-05T22:14:52+00:00

Now that we are using std::variant we should reference it directly instead of using our own namespace alias. Tested: Built and ran through unit tests. Change-Id: Ic3fd62ea74cf808b85ad7b7ffcce8c0a0bfb125d Signed-off-by: William A. Kennington III

sdbus++: Generate includes for enum references

2019-04-04T06:49:43+00:00

It is common for enums to be shared across different dbus definitions. This change adds the functionality to automatically generate the correct includes for the server.hpp files. Change-Id: Ic5b8df55b58479d18dd4aee20ead9c05b867b968 Signed-off-by: William A. Kennington III

sdbus++: Allow server.hpp files to have extra generated includes

2019-04-04T03:43:17+00:00

This allows for a future change that adds includes to the generated server.hpp file that it needs for enum definitions. Change-Id: Id8ecd03a8cc1155cc9032840f38bf5ccb28d40c0 Signed-off-by: William A. Kennington III

sdbus++: Fix mako include substitution for signals

2019-04-04T03:43:17+00:00

This allows the signal generator to emit include directives Change-Id: I47a13102491116772c31b57ca58824fda3612938 Signed-off-by: William A. Kennington III

Support default string values

2019-02-07T18:21:28+00:00

For properties of type string, allow a default value to be set for the property on the interface. This provides the ability to have a default value to an intended free-form string instead of using enumerated values. Tested: Verified generated interface object initializes a string property to a default value Only properties of type string with a default defined are initialized with the given default value as a string Change-Id: I1e75dff1c26a4a872e9e3e7959106470c32c9be7 Signed-off-by: Matthew Barth

Revert "Revert "Fix incorrect defaultValue in generated server.hpp""

2019-01-17T01:46:50+00:00

This reverts commit 8192be92b9bf50450eb309a8798b3895bfdae471. The commit "Fix incorrect defaultValue in generated server.hpp" revealed an issue in phosphor-dbus-interfaces that causes the build error, and it was reverted temporarily. The issue is fixed in phosphor-dbus-interface, so we could add it back. Change-Id: I1700ff1ede5f0eedc11fc324f649ea4f2e76edf5 Signed-off-by: Lei YU