Changeset 044dd20

Timestamp:

Jan 13, 2012 1:38:17 PM (13 years ago)

Author:

Ted Faber <faber@…>

Branches:

compt_changes, info-ops, master

Children:

923984c

Parents:

6bedbdba

Message:

Move ip_addr and ip_allocator out

Location:

fedd

Files:

• deter/__init__.py (modified) (1 diff)
• deter/ip_addr.py (moved) (moved from fedd/federation/ip_addr.py)
• deter/ip_allocator.py (moved) (moved from fedd/federation/ip_allocator.py)
• federation/experiment_control.py (modified) (1 diff)
• federation/experiment_control_legacy.py (modified) (1 diff)
• federation/experiment_partition.py (modified) (1 diff)

fedd/deter/__init__.py

@@ -3 +3 @@
 import topdl 
 from fedid import *
+from ip_allocator import *
+from ip_addr import *

fedd/federation/experiment_control.py

@@ -40 +40 @@
 
 from deter import topdl
+from deter import ip_allocator
+from deter import ip_addr
 import list_log
-from ip_allocator import ip_allocator
-from ip_addr import ip_addr
 
 

fedd/federation/experiment_control_legacy.py

@@ -35 +35 @@
 
 from deter import topdl
+from deter import ip_allocator
+from deter import ip_addr
 import list_log
-from ip_allocator import ip_allocator
-from ip_addr import ip_addr
 
 

fedd/federation/experiment_partition.py

@@ -31 +31 @@
 
 from deter import topdl
+from deter import ip_allocator
+from deter import ip_addr
 import list_log
-from ip_allocator import ip_allocator
-from ip_addr import ip_addr