From: Tony Mack <tmack@paris.CS.Princeton.EDU>
Date: Sat, 1 Oct 2011 04:30:25 +0000 (-0400)
Subject: fix merge
X-Git-Tag: sfa-1.1-1~162
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=c4836c09d50f7b0a7aa574b1f103853b8e956651;p=sfa.git

fix merge
---

diff --git a/sfa/rspecs/versions/sfav1.py b/sfa/rspecs/versions/sfav1.py
index 7cd8a149..2196d81f 100644
--- a/sfa/rspecs/versions/sfav1.py
+++ b/sfa/rspecs/versions/sfav1.py
@@ -333,16 +333,16 @@ class SFAv1(BaseVersion):
         Merge contents for specified rspec with current rspec
         """
 
-        from sfa.rspecs.rspec_parser import parse_rspec
-        rspec = parse_rspec(in_rspec)
-        if rspec.type.lower() == 'protogeni':
+        from sfa.rspecs.rspec import RSpec
+        rspec = RSpec(in_rspec)
+        if rspec.version.type.lower() == 'protogeni':
             from sfa.rspecs.rspec_converter import RSpecConverter
             in_rspec = RSpecConverter.to_sfa_rspec(in_rspec)
 
         # just copy over all networks
         current_networks = self.get_networks()
-        rspec = SfaRSpec(rspec=in_rspec)
-        networks = rspec.get_network_elements()
+        rspec = RSpec(rspec=in_rspec)
+        networks = rspec.version.get_network_elements()
         for network in networks:
             current_network = network.get('name')
             if current_network and current_network not in current_networks: