Changeset b236eed for fedd

Timestamp:

Sep 24, 2009 6:35:09 PM (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:

0fa1729

Parents:

46bc576

Message:

IP address output for dragon mounted portals

File:

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

fedd/federation/emulab_access.py

@@ -846 +846 @@
                         "Can't find segment for portal %s" % myname)
 
+            is_ip = re.match('\d+\.\d+\.\d+\.\d+', peer)
+
             rexp = seg.get_attribute('experiment')
             rproj, reid = rexp.split("/", 1)
@@ -870 +872 @@
                         % (rproj, reid, peer.lower(), reid.lower(),
                                 rproj.lower(), rdomain)
-                print >>f, "Peer: %s.%s.%s%s" % \
-                        (peer.lower(), reid.lower(), rproj.lower(), rdomain)
+                if is_ip:
+                    print >>f, "Peer: %s" % peer
+                else:
+                    print >>f, "Peer: %s.%s.%s%s" % \
+                            (peer.lower(), reid.lower(), 
+                                    rproj.lower(), rdomain)
                 print >>f, "RemoteScriptDir: %s" % scriptdir
                 print >>f, "Pubkeys: /proj/%s/exp/%s/tmp/%s" % \