apmanager: Fixed dbus paths for consistency with buffet and peerd.
All dbus paths moved from from "/" to "/org/chromium/apmanager/" for consistency
with other components.
"name" in org.chromium.apmanager.Manager set to /org/chromium/apmanager/Manager.
This allow to skip object path creating proxy.
"name" removed from following interfaces as object paths generated in run time:
org.chromium.apmanager.Config.xml
org.chromium.apmanager.Device.xml
org.chromium.apmanager.Service.xml
Fixed xmlns:tp URI.
BUG=chromium:441172
TEST=FEATURES=test emerge-link apmanager
Change-Id: I62e7394a11b1b925776e9cce7ab768d5f9802650
Reviewed-on: https://chromium-review.googlesource.com/234661
Reviewed-by: Alex Vakulenko <avakulenko@chromium.org>
Reviewed-by: Vitaly Buka <vitalybuka@chromium.org>
Commit-Queue: Vitaly Buka <vitalybuka@chromium.org>
Trybot-Ready: Vitaly Buka <vitalybuka@chromium.org>
Tested-by: Vitaly Buka <vitalybuka@chromium.org>
diff --git a/service.cc b/service.cc
index ced17dc..f00a21e 100644
--- a/service.cc
+++ b/service.cc
@@ -15,6 +15,7 @@
using chromeos::dbus_utils::AsyncEventSequencer;
using chromeos::dbus_utils::ExportedObjectManager;
+using org::chromium::apmanager::ManagerAdaptor;
using std::string;
namespace apmanager {
@@ -28,9 +29,10 @@
: org::chromium::apmanager::ServiceAdaptor(this),
manager_(manager),
service_identifier_(service_identifier),
- service_path_(base::StringPrintf("%s/services/%d",
- kManagerPath,
- service_identifier)),
+ service_path_(
+ base::StringPrintf("%s/services/%d",
+ ManagerAdaptor::GetObjectPath().value().c_str(),
+ service_identifier)),
dbus_path_(dbus::ObjectPath(service_path_)),
config_(new Config(manager, service_path_)),
dhcp_server_factory_(DHCPServerFactory::GetInstance()) {