diff options
author | Brad Bishop <bradleyb@us.ibm.com> | 2016-03-18 11:16:47 -0400 |
---|---|---|
committer | Brad Bishop <bradleyb@us.ibm.com> | 2016-03-18 12:08:35 -0400 |
commit | 9cff26bb5f801e07d5e6ae83847051ead4d74df2 (patch) | |
tree | a4b429284ad31a7b3929f70776db5e9740d0d168 /phosphor-mapper | |
parent | fed968eeb96e225dd9ff93f3bf21b2bb42546bea (diff) | |
download | phosphor-objmgr-9cff26bb5f801e07d5e6ae83847051ead4d74df2.tar.gz phosphor-objmgr-9cff26bb5f801e07d5e6ae83847051ead4d74df2.zip |
Minor refactoring
No functional changes.
Changed any bus name references to "owner".
A couple whitespace changes.
Diffstat (limited to 'phosphor-mapper')
-rw-r--r-- | phosphor-mapper | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/phosphor-mapper b/phosphor-mapper index bf0e832..a00beaa 100644 --- a/phosphor-mapper +++ b/phosphor-mapper @@ -33,7 +33,7 @@ class MapperNotFoundException(dbus.exceptions.DBusException): def __init__(self, path): super(MapperNotFoundException, self).__init__( - "path or object not found: %s" % (path)) + "path or object not found: %s" % path) class ObjectMapper(dbus.service.Object): @@ -66,10 +66,10 @@ class ObjectMapper(dbus.service.Object): signal_name='InterfacesRemoved', sender_keyword='sender') - def bus_match(self, name): - if name == obmc.mapper.MAPPER_NAME: - return False - return self.name_match(name) + def bus_match(self, owner): + # Ignore my own signals + return owner != obmc.mapper.MAPPER_NAME and \ + self.name_match(owner) def discovery_pending(self): return not bool(self.service) @@ -92,19 +92,19 @@ class ObjectMapper(dbus.service.Object): new = list(set(old).difference(interfaces)) self.update_interfaces(path, owner, old, new) - def process_new_owner(self, name): + def process_new_owner(self, owner): # unique name - return self.discover([IntrospectionParser(name, + return self.discover([IntrospectionParser(owner, self.bus.dbus, self.tag_match, self.intf_match)]) - def process_old_owner(self, name): + def process_old_owner(self, owner): for path, item in self.cache.dataitems(): - old = self.interfaces_get(item, name) + old = self.interfaces_get(item, owner) # remove all interfaces for this service self.update_interfaces( - path, name, old=old, new=[]) + path, owner, old=old, new=[]) def bus_handler(self, owner, old, new): valid = False @@ -129,12 +129,14 @@ class ObjectMapper(dbus.service.Object): interfaces = [str(i) for i in items.get('interfaces', [])] self.update_interfaces(path, str(owner), old=[], new=interfaces) - def discover(self, owners=None): + def discover(self, owners=[]): if not owners: - owners = [IntrospectionParser(x, self.bus.dbus, - self.tag_match, - self.intf_match) - for x in self.bus.get_owner_names(self.bus_match)] + owners = [ + IntrospectionParser( + x, self.bus.dbus, + self.tag_match, + self.intf_match) + for x in self.bus.get_owner_names(self.bus_match)] for o in owners: self.add_items(o.name, o.introspect()) |