Rename Manager -> Controller (#712)

Signed-off-by: Mark Kemel <mkemel@redhat.com>

README.developer.md

@@ -72,7 +72,7 @@ of installation for your setup.
          /org/eclipse/bluechi
 
 NAME                                TYPE      SIGNATURE RESULT/VALUE   FLAGS
-org.eclipse.bluechi.Manager         interface -         -              -
+org.eclipse.bluechi.Controller         interface -         -              -
 .CreateMonitor                      method    -         o              -
 .DisableMetrics                     method    -         -              -
 .EnableMetrics                      method    -         -              -
@@ -100,7 +100,7 @@ org.freedesktop.DBus.Properties     interface -         -              -
 ```bash
 export SERVICE="org.eclipse.bluechi"
 export OBJECT="/org/eclipse/bluechi"
-export INTERFACE="org.eclipse.bluechi.Manager"
+export INTERFACE="org.eclipse.bluechi.Controller"
 export METHOD="ListNodes"
 
 # busctl call \

bluechi.spec.in

@@ -68,7 +68,7 @@ This package contains the controller service.
 %license LICENSE
 %{_libexecdir}/bluechi-controller
 %{_datadir}/dbus-1/interfaces/org.eclipse.bluechi.Job.xml
-%{_datadir}/dbus-1/interfaces/org.eclipse.bluechi.Manager.xml
+%{_datadir}/dbus-1/interfaces/org.eclipse.bluechi.Controller.xml
 %{_datadir}/dbus-1/interfaces/org.eclipse.bluechi.Monitor.xml
 %{_datadir}/dbus-1/interfaces/org.eclipse.bluechi.Node.xml
 %{_datadir}/dbus-1/system.d/org.eclipse.bluechi.conf

config/agent/agent.conf

@@ -11,12 +11,12 @@
 #NodeName=
 
 #
-# The IP address that bluechi-agent can use to connect to bluechi manager. It must be a valid IPv4 or IPv6 address.
+# The IP address that bluechi-agent can use to connect to bluechi-controller. It must be a valid IPv4 or IPv6 address.
 # One of the ControllerHost or ControllerAddress options must be set for each bluechi-agent.
 #ControllerHost=
 
 #
-# The port the manager listens on to establish connections with the bluechi agents.
+# The port the controller listens on to establish connections with the bluechi agents.
 #ControllerPort=842
 
 #

config/controller/controller.conf

@@ -6,14 +6,14 @@
 [bluechi-controller]
 
 #
-# A comma separated list of unique bluechi-agent names. Only nodes with names mentioned in the list can connect to bluechi
-# manager. These names are defined in the agent's configuration file under the `NodeName` option.
+# A comma separated list of unique bluechi-agent names. Only nodes with names mentioned in the list can connect to
+# bluechi-controller. These names are defined in the agent's configuration file under the `NodeName` option.
 # (see `bluechi-agent.conf(5)`).
 # Note: The maximum line length is 500 characters. If the list exceeds this, use multiple, indented lines.
 #AllowedNodeNames=
 
 #
-# The port the manager listens on to establish connections with the bluechi agents.
+# The port the controller listens on to establish connections with the bluechi agents.
 #ControllerPort=842
 
 #

data/meson.build

@@ -4,7 +4,7 @@
 install_data(
     [
         'org.eclipse.bluechi.Job.xml',
-        'org.eclipse.bluechi.Manager.xml',
+        'org.eclipse.bluechi.Controller.xml',
         'org.eclipse.bluechi.Monitor.xml',
         'org.eclipse.bluechi.Node.xml',
         'org.eclipse.bluechi.Agent.xml'

data/org.eclipse.bluechi.Manager.xml → data/org.eclipse.bluechi.Controller.xml

@@ -3,12 +3,12 @@
 <node>
 
   <!-- 
-    org.eclipse.bluechi.Manager:
+    org.eclipse.bluechi.Controller:
     @short_description: Public interface of BlueChi on the managing node providing methods and signals for all nodes.
 
     This interface can be used to get information about all nodes and their units, create monitors and listen for job signals.
   -->
-  <interface name="org.eclipse.bluechi.Manager">
+  <interface name="org.eclipse.bluechi.Controller">
 
     <!-- 
       ListUnits:
@@ -84,7 +84,7 @@
       SetLogLevel:
       @loglevel: The new loglevel to use. 
 
-      Change the loglevel of the manager.
+      Change the loglevel of the controller.
     -->
     <method name="SetLogLevel">
       <arg name="loglevel" type="s" direction="in" />

data/org.eclipse.bluechi.Metrics.xml

@@ -6,7 +6,7 @@
     org.eclipse.bluechi.Metrics:
     @short_description: Public interface of BlueChi on the managing node providing signals for performance metrics.
 
-    This interface is only available if the metrics have been enabled before via the Manager interface.
+    This interface is only available if the metrics have been enabled before via the Controller interface.
   -->
   <interface name="org.eclipse.bluechi.Metrics">
 

data/org.eclipse.bluechi.Monitor.xml

@@ -6,7 +6,7 @@
     org.eclipse.bluechi.Monitor:
     @short_description: Public interface of BlueChi on the managing node providing monitoring functionality.
 
-    This interface is only available if a monitor has been created before via the Manager interface.
+    This interface is only available if a monitor has been created before via the Controller interface.
     It provides methods to subscribe to changes in systemd units on managed nodes as well as signals for those changes.
   -->
   <interface name="org.eclipse.bluechi.Monitor">

data/org.eclipse.bluechi.Node.xml

@@ -21,7 +21,7 @@
     fails if mode is fail.
 
       The job returned is an object path for an object implementing org.eclipse.bluechi.Job, and which be monitored for the progress of the job, or used
-    to cancel the job. To track the result of the job, follow the JobRemoved signal on the Manager.
+    to cancel the job. To track the result of the job, follow the JobRemoved signal on the Controller.
     -->
     <method name="StartUnit">
       <arg name="name" type="s" direction="in" />
@@ -205,7 +205,7 @@
       SetLogLevel:
       @loglevel: The new loglevel to use. 
 
-      Change the loglevel of the manager.
+      Change the loglevel of the controller.
     -->
     <method name="SetLogLevel">
       <arg name="level" type="s" direction="in" />

data/org.eclipse.bluechi.internal.Manager.xml → data/org.eclipse.bluechi.internal.Controller.xml

@@ -1,7 +1,7 @@
 <!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
 <!-- SPDX-License-Identifier: LGPL-2.1-or-later -->
 <node>
-  <interface name="org.eclipse.bluechi.internal.Manager">
+  <interface name="org.eclipse.bluechi.internal.Controller">
     <method name="Register">
       <arg name="name" type="s" direction="in" />
     </method>

doc/api-examples/c/list-nodes.c

@@ -20,7 +20,7 @@ int main() {
                         bus,
                         "org.eclipse.bluechi",
                         "/org/eclipse/bluechi",
-                        "org.eclipse.bluechi.Manager",
+                        "org.eclipse.bluechi.Controller",
                         "ListNodes",
                         &error,
                         &result,

doc/api-examples/c/start-unit.c

@@ -12,7 +12,7 @@ static int get_node_path(sd_bus *bus, char *node_name, char **ret_node_path) {
                         bus,
                         "org.eclipse.bluechi",
                         "/org/eclipse/bluechi",
-                        "org.eclipse.bluechi.Manager",
+                        "org.eclipse.bluechi.Controller",
                         "GetNode",
                         &error,
                         &result,

doc/api-examples/go/enable-unit.go

@@ -12,7 +12,7 @@ import (
 const (
 	BcDusInterface        = "org.eclipse.bluechi"
 	BcObjectPath          = "/org/eclipse/bluechi"
-	MethodGetNode         = "org.eclipse.bluechi.Manager.GetNode"
+	MethodGetNode         = "org.eclipse.bluechi.Controller.GetNode"
 	MethodEnableUnitFiles = "org.eclipse.bluechi.Node.EnableUnitFiles"
 )
 

doc/api-examples/go/get-cpuweight.go

@@ -12,7 +12,7 @@ import (
 const (
 	BcDusInterface        = "org.eclipse.bluechi"
 	BcObjectPath          = "/org/eclipse/bluechi"
-	MethodGetNode         = "org.eclipse.bluechi.Manager.GetNode"
+	MethodGetNode         = "org.eclipse.bluechi.Controller.GetNode"
 	MethodGetUnitProperty = "org.eclipse.bluechi.Node.GetUnitProperty"
 )
 

doc/api-examples/go/list-node-units.go

@@ -12,7 +12,7 @@ import (
 const (
 	BcDusInterface  = "org.eclipse.bluechi"
 	BcObjectPath    = "/org/eclipse/bluechi"
-	MethodGetNode   = "org.eclipse.bluechi.Manager.GetNode"
+	MethodGetNode   = "org.eclipse.bluechi.Controller.GetNode"
 	MethodListUnits = "org.eclipse.bluechi.Node.ListUnits"
 )
 

doc/api-examples/go/list-nodes.go

@@ -12,7 +12,7 @@ import (
 const (
 	BcDusInterface  = "org.eclipse.bluechi"
 	BcObjectPath    = "/org/eclipse/bluechi"
-	MethodListNodes = "org.eclipse.bluechi.Manager.ListNodes"
+	MethodListNodes = "org.eclipse.bluechi.Controller.ListNodes"
 )
 
 func main() {

doc/api-examples/go/monitor-system-status.go

@@ -10,9 +10,9 @@ import (
 )
 
 const (
-	BcDusInterface     = "org.eclipse.bluechi"
-	BcObjectPath       = "/org/eclipse/bluechi"
-	BcManagerInterface = "org.eclipse.bluechi.Manager"
+	BcDusInterface        = "org.eclipse.bluechi"
+	BcObjectPath          = "/org/eclipse/bluechi"
+	BcControllerInterface = "org.eclipse.bluechi.Controller"
 )
 
 func main() {
@@ -34,7 +34,7 @@ func main() {
 	conn.Signal(c)
 	for v := range c {
 		ifaceName := v.Body[0]
-		if ifaceName == BcManagerInterface {
+		if ifaceName == BcControllerInterface {
 			changedValues, ok := v.Body[1].(map[string]dbus.Variant)
 			if !ok {
 				fmt.Println("Received invalid property changed signal")

doc/api-examples/go/monitor-unit.go

@@ -13,7 +13,7 @@ import (
 const (
 	BcDusInterface      = "org.eclipse.bluechi"
 	BcObjectPath        = "/org/eclipse/bluechi"
-	MethodCreateMonitor = "org.eclipse.bluechi.Manager.CreateMonitor"
+	MethodCreateMonitor = "org.eclipse.bluechi.Controller.CreateMonitor"
 	MethodSubscribe     = "org.eclipse.bluechi.Monitor.Subscribe"
 
 	SignalUnitNew               = "UnitNew"

doc/api-examples/go/set-cpuweight.go

@@ -13,7 +13,7 @@ import (
 const (
 	BcDusInterface          = "org.eclipse.bluechi"
 	BcObjectPath            = "/org/eclipse/bluechi"
-	MethodGetNode           = "org.eclipse.bluechi.Manager.GetNode"
+	MethodGetNode           = "org.eclipse.bluechi.Controller.GetNode"
 	MethodSetUnitProperties = "org.eclipse.bluechi.Node.SetUnitProperties"
 )
 

doc/api-examples/go/start-unit.go

@@ -12,7 +12,7 @@ import (
 const (
 	BcDusInterface  = "org.eclipse.bluechi"
 	BcObjectPath    = "/org/eclipse/bluechi"
-	MethodGetNode   = "org.eclipse.bluechi.Manager.GetNode"
+	MethodGetNode   = "org.eclipse.bluechi.Controller.GetNode"
 	MethodStartUnit = "org.eclipse.bluechi.Node.StartUnit"
 )
 

doc/api-examples/python/enable-unit.py

@@ -15,8 +15,8 @@
 
 node_name = sys.argv[1]
 
-manager = bus.get_proxy("org.eclipse.bluechi", "/org/eclipse/bluechi")
-node_path = manager.GetNode(node_name)
+controller = bus.get_proxy("org.eclipse.bluechi", "/org/eclipse/bluechi")
+node_path = controller.GetNode(node_name)
 node = bus.get_proxy("org.eclipse.bluechi", node_path)
 
 response = node.EnableUnitFiles(sys.argv[2:], False, False)

doc/api-examples/python/get-cpuweight.py

@@ -12,8 +12,8 @@
 node_name = sys.argv[1]
 unit_name = sys.argv[2]
 
-manager = bus.get_proxy("org.eclipse.bluechi", "/org/eclipse/bluechi")
-node_path = manager.GetNode(node_name)
+controller = bus.get_proxy("org.eclipse.bluechi", "/org/eclipse/bluechi")
+node_path = controller.GetNode(node_name)
 node = bus.get_proxy("org.eclipse.bluechi", node_path)
 
 value = node.GetUnitProperty(unit_name, "org.freedesktop.systemd1.Service", "CPUWeight")

doc/api-examples/python/get-unit-properties.py

@@ -13,8 +13,8 @@
 node_name = sys.argv[1]
 unit_name = sys.argv[2]
 
-manager = bus.get_proxy("org.eclipse.bluechi", "/org/eclipse/bluechi")
-node_path = manager.GetNode(node_name)
+controller = bus.get_proxy("org.eclipse.bluechi", "/org/eclipse/bluechi")
+node_path = controller.GetNode(node_name)
 node = bus.get_proxy("org.eclipse.bluechi", node_path)
 
 properties = node.GetUnitProperties(unit_name, "org.freedesktop.systemd1.Unit")

doc/api-examples/python/get-unit-property.py

@@ -15,8 +15,8 @@
 iface_name = sys.argv[3]
 property_name = sys.argv[4]
 
-manager = bus.get_proxy("org.eclipse.bluechi", "/org/eclipse/bluechi")
-node_path = manager.GetNode(node_name)
+controller = bus.get_proxy("org.eclipse.bluechi", "/org/eclipse/bluechi")
+node_path = controller.GetNode(node_name)
 node = bus.get_proxy("org.eclipse.bluechi", node_path)
 
 val = node.GetUnitProperty(unit_name, iface_name, property_name)

doc/api-examples/python/list-active-services.py

@@ -9,8 +9,8 @@
                                            "description", "load_state", "active_state", "sub_state", "follower",
                                            "object_path", "job_id", "job_type", "job_object_path"])
 
-manager = bus.get_proxy("org.eclipse.bluechi",  "/org/eclipse/bluechi")
-units = manager.ListUnits()
+controller = bus.get_proxy("org.eclipse.bluechi",  "/org/eclipse/bluechi")
+units = controller.ListUnits()
 for u in units:
     info = NodeUnitInfo(*u)
     if info.active_state == "active" and info.name.endswith(".service"):

doc/api-examples/python/list-node-units.py

@@ -16,8 +16,8 @@
 
 node_name = sys.argv[1]
 
-manager = bus.get_proxy("org.eclipse.bluechi", "/org/eclipse/bluechi")
-node_path = manager.GetNode(node_name)
+controller = bus.get_proxy("org.eclipse.bluechi", "/org/eclipse/bluechi")
+node_path = controller.GetNode(node_name)
 node = bus.get_proxy("org.eclipse.bluechi", node_path)
 
 units = node.ListUnits()

doc/api-examples/python/list-nodes.py

@@ -8,8 +8,8 @@
 
 NodeInfo = namedtuple("NodeInfo", ["name", "object_path", "status"])
 
-manager = bus.get_proxy("org.eclipse.bluechi", "/org/eclipse/bluechi")
-nodes = manager.ListNodes()
+controller = bus.get_proxy("org.eclipse.bluechi", "/org/eclipse/bluechi")
+nodes = controller.ListNodes()
 for n in nodes:
     info = NodeInfo(*n)
     print(f"Node: {info.name}, State: {info.status}")

doc/api-examples/python/monitor-node-connections.py

@@ -9,8 +9,8 @@
 loop = EventLoop()
 bus = dasbus.connection.SystemMessageBus()
 
-manager = bus.get_proxy("org.eclipse.bluechi", "/org/eclipse/bluechi")
-nodes = manager.ListNodes()
+controller = bus.get_proxy("org.eclipse.bluechi", "/org/eclipse/bluechi")
+nodes = controller.ListNodes()
 cached_nodes = []
 for n in nodes:
     # node: [name, path, status]

doc/api-examples/python/monitor-unit.py

@@ -30,9 +30,9 @@ def print_dict_changes(old, new):
 
 bus = dasbus.connection.SystemMessageBus()
 
-manager = bus.get_proxy("org.eclipse.bluechi", "/org/eclipse/bluechi")
+controller = bus.get_proxy("org.eclipse.bluechi", "/org/eclipse/bluechi")
 
-monitor_path = manager.CreateMonitor()
+monitor_path = controller.CreateMonitor()
 monitor = bus.get_proxy("org.eclipse.bluechi", monitor_path)
 
 old_values = {}

doc/api-examples/python/set-cpuweight.py

@@ -17,8 +17,8 @@
 # Don't persist change
 runtime = True
 
-manager = bus.get_proxy("org.eclipse.bluechi", "/org/eclipse/bluechi")
-node_path = manager.GetNode(node_name)
+controller = bus.get_proxy("org.eclipse.bluechi", "/org/eclipse/bluechi")
+node_path = controller.GetNode(node_name)
 node = bus.get_proxy("org.eclipse.bluechi", node_path)
 
 node.SetUnitProperties(unit_name, runtime, [("CPUWeight", Variant("t", value))])

doc/api-examples/python/start-unit.py

@@ -13,8 +13,8 @@
 node_name = sys.argv[1]
 unit_name = sys.argv[2]
 
-manager = bus.get_proxy("org.eclipse.bluechi", "/org/eclipse/bluechi")
-node_path = manager.GetNode(node_name)
+controller = bus.get_proxy("org.eclipse.bluechi", "/org/eclipse/bluechi")
+node_path = controller.GetNode(node_name)
 node = bus.get_proxy("org.eclipse.bluechi", node_path)
 
 my_job_path = node.StartUnit(unit_name, "replace")

doc/api-examples/rust/enable-unit.rs

@@ -28,7 +28,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
     );
 
     let (node,): (Path,) =
-        bluechi.method_call("org.eclipse.bluechi.Manager", "GetNode", (args.node_name,))?;
+        bluechi.method_call("org.eclipse.bluechi.Controller", "GetNode", (args.node_name,))?;
 
     let node_proxy = conn.with_proxy("org.eclipse.bluechi", node, Duration::from_millis(5000));
 

doc/api-examples/rust/get-cpuweight.rs

@@ -29,7 +29,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
     );
 
     let (node,): (Path,) =
-        bluechi.method_call("org.eclipse.bluechi.Manager", "GetNode", (args.node_name,))?;
+        bluechi.method_call("org.eclipse.bluechi.Controller", "GetNode", (args.node_name,))?;
 
     let node_proxy = conn.with_proxy("org.eclipse.bluechi", node, Duration::from_millis(5000));
 

doc/api-examples/rust/list-node-units.rs

@@ -24,7 +24,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
     );
 
     let (node,): (Path,) =
-        bluechi.method_call("org.eclipse.bluechi.Manager", "GetNode", (args.node_name,))?;
+        bluechi.method_call("org.eclipse.bluechi.Controller", "GetNode", (args.node_name,))?;
 
     let node_proxy = conn.with_proxy("org.eclipse.bluechi", node, Duration::from_millis(5000));
 

doc/api-examples/rust/list-nodes.rs

@@ -13,7 +13,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
     );
 
     let (nodes,): (Vec<(String, dbus::Path, String)>,) =
-        bluechi.method_call("org.eclipse.bluechi.Manager", "ListNodes", ())?;
+        bluechi.method_call("org.eclipse.bluechi.Controller", "ListNodes", ())?;
 
     for (name, _, status) in nodes {
         println!("Node: {}, Status: {}", name, status);