Merge branch 'master' into thgeneric
Thierry Parmentelat [Thu, 3 Nov 2011 15:57:26 +0000 (16:57 +0100)]
Conflicts:
sfa/methods/CreateSliver.py

1  2 
setup.py
sfa/methods/CreateSliver.py
sfa/plc/aggregate.py

diff --cc setup.py
Simple merge
@@@ -49,5 -52,9 +50,9 @@@ class CreateSliver(Method)
              chain_name = 'FORWARD-INCOMING'
          self.api.logger.debug("CreateSliver: sfatables on chain %s"%chain_name)
          rspec = run_sfatables(chain_name, hrn, origin_hrn, rspec)
-         return self.api.manager.CreateSliver(self.api, slice_xrn, creds, rspec, users, call_id)
+         slivers = RSpec(rspec).version.get_nodes_with_slivers()
+         if slivers:
 -            result = manager.CreateSliver(self.api, slice_xrn, creds, rspec, users, call_id)
++            result = self.api.manager.CreateSliver(self.api, slice_xrn, creds, rspec, users, call_id)
+         else:
+             result = rspec     
+         return result
Simple merge