fix value of 'component_manager_id' node attribute in PG RSpec

diff --git a/sfa/plc/aggregate.py b/sfa/plc/aggregate.py
index 089ec04..4073243 100644 (file)
--- a/sfa/plc/aggregate.py
+++ b/sfa/plc/aggregate.py
@@ -55,6 +55,7 @@ class Aggregate:
                 interfaces = [self.interfaces[interface_id] for interface_id in node['interface_ids']]
                 tags = [self.node_tags[tag_id] for tag_id in node['node_tag_ids']]
                 node['network'] = self.api.hrn
+                node['network_urn'] = hrn_to_urn(self.api.hrn, 'authority+sa')
                 node['urn'] = hostname_to_urn(self.api.hrn, site['login_base'], node['hostname'])
                 node['site_urn'] = hrn_to_urn(PlXrn.site_hrn(self.api.hrn, site['login_base']), 'authority') 
                 node['site'] = site

diff --git a/sfa/rspecs/pg_rspec.py b/sfa/rspecs/pg_rspec.py
index a151b0a..57381b4 100755 (executable)
--- a/sfa/rspecs/pg_rspec.py
+++ b/sfa/rspecs/pg_rspec.py
@@ -56,8 +56,8 @@ class PGRSpec(RSpec):
                 continue
                 
             node_tag = etree.SubElement(self.xml, 'node')
-            if 'network' in node:
-                node_tag.set('component_manager_id', node['network'])
+            if 'network_urn' in node:
+                node_tag.set('component_manager_id', node['network_urn'])
             if 'urn' in node:
                 node_tag.set('component_id', node['urn'])
             if 'hostname' in node:

diff --git a/sfa/rspecs/rspec_version.py b/sfa/rspecs/rspec_version.py
index 986a10f..98ff745 100644 (file)
--- a/sfa/rspecs/rspec_version.py
+++ b/sfa/rspecs/rspec_version.py
@@ -1,5 +1,5 @@
 #!/usr/bin/python
-from sfa.util.sfalogging import sfa_logger
+from sfa.util.sfalogging import _SfaLogger
 
 
 DEFAULT_FORMAT='sfa'
@@ -13,7 +13,7 @@ class RSpecVersion:
     extensions = []
 
     def __init__(self, version_string):
-        self.logger = sfa_logger() 
+        self.logger = _SfaLogger('/var/log/sfa.log') 
         self.parse_version_string(version_string)
 
     def parse_version_string(self, version_string):