From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Thu, 27 Oct 2011 20:16:07 +0000 (+0200)
Subject: solve conflicts
X-Git-Tag: sfa-1.1-1~6
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=d42c0e79549cbc940fd160f4e9cb1f75e59029ce;hp=25ba0fdec627f472689c9f93a254e666b5d4317d

solve conflicts
---

diff --git a/sfa/managers/aggregate_manager.py b/sfa/managers/aggregate_manager.py
index 2e56a490..20db05cf 100644
--- a/sfa/managers/aggregate_manager.py
+++ b/sfa/managers/aggregate_manager.py
@@ -15,7 +15,7 @@ from sfa.rspecs.version_manager import VersionManager
 from sfa.rspecs.rspec import RSpec
 
 import sfa.plc.peers as peers
-from sfa.plc.api import PlcSfaApi
+from sfa.plc.plcsfaapi import PlcSfaApi
 from sfa.plc.aggregate import Aggregate
 from sfa.plc.slices import Slices
 
diff --git a/sfa/plc/vlink.py b/sfa/plc/vlink.py
index 8aeee498..73ebae79 100644
--- a/sfa/plc/vlink.py
+++ b/sfa/plc/vlink.py
@@ -1,5 +1,5 @@
 
-from sfa.util.plxrn import PlXrn
+from sfa.util.xrn import Xrn
 # Taken from bwlimit.py
 #
 # See tc_util.c and http://physics.nist.gov/cuu/Units/binary.html. Be
@@ -94,7 +94,7 @@ class VLink:
 
     @staticmethod
     def get_interface_id(interface):
-        if_name = PlXrn(interface=interface['component_id']).interface_name()
+        if_name = Xrn(interface=interface['component_id']).get_leaf()
         node, dev = if_name.split(":")
         node_id = int(node.replace("pc", ""))
         return node_id
diff --git a/sfa/rspecs/elements/versions/pgv2Link.py b/sfa/rspecs/elements/versions/pgv2Link.py
index cbe58615..e39ef35d 100644
--- a/sfa/rspecs/elements/versions/pgv2Link.py
+++ b/sfa/rspecs/elements/versions/pgv2Link.py
@@ -117,6 +117,6 @@ class PGv2Link:
     def get_link_requests(xml):
         link_requests = []
         for link in PGv2Link.get_links(xml):
-            if link['client_id']:
+            if link['client_id'] != None:
                 link_requests.append(link)
         return link_requests           
diff --git a/sfa/rspecs/versions/sfav1.py b/sfa/rspecs/versions/sfav1.py
index 3f36e50d..c3bb2084 100644
--- a/sfa/rspecs/versions/sfav1.py
+++ b/sfa/rspecs/versions/sfav1.py
@@ -117,7 +117,7 @@ class SFAv1(BaseVersion):
         return PGv2Link.get_links(self.xml)
 
     def get_link_requests(self):
-        return PGv2Link.get_links(self.xml) 
+        return PGv2Link.get_link_requests(self.xml) 
 
     def get_link(self, fromnode, tonode, network=None):
         fromsite = fromnode.getparent()
diff --git a/sfa/server/sfaapi.py b/sfa/server/sfaapi.py
index 87f7935e..1c462575 100644
--- a/sfa/server/sfaapi.py
+++ b/sfa/server/sfaapi.py
@@ -4,15 +4,15 @@ import datetime
 from sfa.util.faults import SfaAPIError
 from sfa.util.config import Config
 from sfa.util.cache import Cache
-
 from sfa.trust.auth import Auth
 from sfa.trust.certificate import Keypair, Certificate
 from sfa.trust.credential import Credential
 
-# this is wrong all right, but temporary 
+# this is wrong all right, but temporary, will use generic
 from sfa.managers.managerwrapper import ManagerWrapper, import_manager
-
 from sfa.server.xmlrpcapi import XmlrpcApi
+import os
+import datetime
 
 ####################
 class SfaApi (XmlrpcApi): 
diff --git a/sfa/server/threadedserver.py b/sfa/server/threadedserver.py
index b9b3ba54..7a9c368b 100644
--- a/sfa/server/threadedserver.py
+++ b/sfa/server/threadedserver.py
@@ -21,6 +21,7 @@ from sfa.util.config import Config
 from sfa.util.cache import Cache 
 from sfa.trust.certificate import Certificate
 from sfa.trust.trustedroots import TrustedRoots
+
 # don't hard code an api class anymore here
 from sfa.generic import Generic
 
diff --git a/sfa/util/xml.py b/sfa/util/xml.py
index 06d61c9c..78e4c6a2 100755
--- a/sfa/util/xml.py
+++ b/sfa/util/xml.py
@@ -55,14 +55,13 @@ class XML:
         # set namespaces map
         self.namespaces = dict(self.root.nsmap)
         if 'default' not in self.namespaces and None in self.namespaces: 
+            # If the 'None' exist, then it's pointing to the default namespace. This makes 
+            # it hard for us to write xpath queries for the default naemspace because lxml 
+            # wont understand a None prefix. We will just associate the default namespeace 
+            # with a key named 'default'.     
             self.namespaces['default'] = self.namespaces[None]
-        # If the 'None' exist, then it's pointing to the default namespace. This makes 
-        # it hard for us to write xpath queries for the default naemspace because lxml 
-        # wont understand a None prefix. We will just associate the default namespeace 
-        # with a key named 'default'.     
-        if None in self.namespaces:
-            default_namespace = self.namespaces.pop(None)
-            self.namespaces['default'] = default_namespace
+        else:
+            self.namespaces['default'] = 'default' 
 
         # set schema 
         for key in self.root.attrib.keys():