Changeset 0ac1934 for fedd

Timestamp:

Mar 2, 2010 1:43:02 PM (15 years ago)

Author:

Ted Faber <faber@…>

Branches:

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

Children:

93c865a

Parents:

37f6592

Message:

Small SEER things. Compute a correct visualization and done tell an exporting tstbed to configure services

Location:

fedd/federation

Files:

• emulab_access.py (modified) (1 diff)
• experiment_control.py (modified) (1 diff)

fedd/federation/emulab_access.py

@@ -1043 +1043 @@
                                 ldomain.lower())
                     for s in services:
-                        if s.get('name',"") in self.imports:
+                        if s.get('name',"") in self.imports and \
+                                s.get('visibility','') == 'import':
                             client_service_out[s['name']](f, s)
                     # Does seer need this?

fedd/federation/experiment_control.py

@@ -692 +692 @@
         # These are used to parse neato output and to create the visualization
         # file.
-        vis_re = re.compile('^\s*"?([\w\-]+)"?\s+\[.*pos="(\d+),(\d+)"')
+        vis_re = re.compile('^\s*"?([\w\-]+)"?\s+\[.*pos="([\d\.]+),([\d\.]+)"')
         vis_fmt = "<node><name>%s</name><x>%s</x><y>%s</y><type>" + \
                 "%s</type></node>"