Changeset 36fec1b for fedd

Timestamp:

Nov 3, 2009 10:52:54 AM (15 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master, version-2.00, version-3.01, version-3.02

Children:

6409cc5

Parents:

f760064

Message:

order dragon endpoints

File:

• fedd/federation/dragon_access.py (modified) (2 diffs)

fedd/federation/dragon_access.py

@@ -67 +67 @@
         self.axis2_home = config.get("access", "axis2_home")
         self.idc_url = config.get("access", "idc")
+        self.domain = config.get("access", "domain")
 
         self.attrs = { }
@@ -539 +540 @@
         else:
             cap = 100
+
+
+        # DRAGON's command line tool barfs if the source (ends[0]) is not in
+        # the domain controlled by the IDC.  This code ensures this situation.
+        if self.domain and not ends[0].endswith(self.domain):
+            hold = ends[0]
+            for i, e in enumerate(ends):
+                if i == 0: continue
+                if e.endswith(self.domain):
+                    ends[0] = e
+                    ends[i] = hold
+                    break
+            else:
+                raise service_error(service_error.req, 
+                        "No endpoint in my domain")
+
 
         return cap, ends[0], ends[1], vlans