Merge branch 'master' into senslab2

[sfa.git] / sfa / plc / plaggregate.py

diff --git a/sfa/plc/plaggregate.py b/sfa/plc/plaggregate.py
index 1fed455..4cc2c55 100644 (file)
--- a/sfa/plc/plaggregate.py
+++ b/sfa/plc/plaggregate.py
@@ -1,6 +1,7 @@
 #!/usr/bin/python
 from sfa.util.xrn import Xrn, hrn_to_urn, urn_to_hrn, urn_to_sliver_id
 from sfa.util.sfatime import epochparse
+from sfa.util.sfalogging import logger
 
 from sfa.rspecs.rspec import RSpec
 from sfa.rspecs.elements.hardware_type import HardwareType
@@ -23,7 +24,6 @@ class PlAggregate:
 
     def __init__(self, driver):
         self.driver = driver
-        self.user_options = {}
  
     def get_sites(self, filter={}):
         sites = {}
@@ -203,6 +203,9 @@ class PlAggregate:
                 interface['ipv4'] = interface['ip']
                 interface['component_id'] = PlXrn(auth=self.driver.hrn, 
                                                   interface='node%s:eth%s' % (node['node_id'], if_count)).get_urn()
+                # interfaces in the manifest need a client id
+                if slice:
+                    interface['client_id'] = "%s:%s" % (node['node_id'], if_id)            
                 rspec_node['interfaces'].append(interface)
                 if_count+=1