switch to sfa module

diff --git a/coblitz-tags.mk b/coblitz-tags.mk
index 945d80e..6e42f55 100644 (file)
--- a/coblitz-tags.mk
+++ b/coblitz-tags.mk
@@ -39,7 +39,7 @@ BootCD-SVNPATH                        := http://svn.planet-lab.org/svn/BootCD/tags/BootCD-4.2-14
 VserverReference-SVNPATH       := http://svn.planet-lab.org/svn/VserverReference/tags/VserverReference-4.2-12
 BootstrapFS-SVNPATH            := http://svn.planet-lab.org/svn/BootstrapFS/tags/BootstrapFS-1.0-8
 MyPLC-SVNPATH                  := http://svn.planet-lab.org/svn/MyPLC/tags/MyPLC-4.3-21
-sfa-SVNPATH                     := http://svn.planet-lab.org/svn/geniwrapper/tags/geniwrapper-0.8-6
+sfa-SVNPATH                     := http://svn.planet-lab.org/svn/sfa/tags/sfa-0.9-0
 pyopenssl-SVNPATH               := http://svn.planet-lab.org/svn/pyopenssl/tags/pyopenssl-0.9-1
 PLCRT-SVNPATH                  := http://svn.planet-lab.org/svn/PLCRT/tags/PLCRT-1.0-5
 

diff --git a/coblitz.mk b/coblitz.mk
index 363b34c..302f2a7 100644 (file)
--- a/coblitz.mk
+++ b/coblitz.mk
@@ -277,7 +277,7 @@ ALL += pyopenssl
 
 
 #
-# sfa - Slice Facility Architecture - fka geniwrapper
+# sfa - Slice Facility Architecture
 #
 sfa-MODULES := sfa
 sfa-SPEC := sfa.spec

diff --git a/module-log.py b/module-log.py
index 5ab5374..2241460 100755 (executable)
--- a/module-log.py
+++ b/module-log.py
@@ -17,10 +17,10 @@ modules_map = {
              'NodeUpdate', 'CoDemux', 
              'nodeconfig', 'pl_sshd', 
              'libnl', 'pypcilib', 'pyplnet',],
-    'wifi' : ['madwifi', 'PlanetBridge', 'wifiadmin', 'hostapd',],
+    'wifi' : ['madwifi', 'PlanetBridge', 'hostapd',],
     'emulation': ['dummynet_image', 'ipfw', ],
     'netflow' : [ 'fprobe-ulog', 'pf2gui', 'pf2monitor', 'pf2slice', 'iproute2', 'iptables', 'silk',],
-    'sfa' : [ 'geniwrapper', 'xmlrspecs', 'pyopenssl', ],
+    'sfa' : [ 'sfa', 'xmlrspecs', 'pyopenssl', ],
     'vsys' : ['vsys', 'vsys-scripts', 'vsys-wrappers', 'inotify-tools'],
     'deprecated' : [ 'proper', 'libhttpd++', 'oombailout', 'ulogd', 'patchdep', 'pdelta', 
                     'sandbox', 'playground', 'infrastructure', 'util-python', 'vnetspec', 

diff --git a/modules.list b/modules.list
index 39b5212..448cacb 100644 (file)
--- a/modules.list
+++ b/modules.list
@@ -16,7 +16,6 @@ comgt
 drupal
 dummynet_image
 fprobe-ulog
-geniwrapper
 inotify-tools
 iproute2
 iptables
@@ -34,6 +33,7 @@ planetlab-umts-tools
 pyopenssl
 pypcilib
 pyplnet
+sfa
 util-vserver-pl
 util-vserver:scholz
 vsys-scripts

diff --git a/onelab-tags.mk b/onelab-tags.mk
index eb407a3..8c1cda7 100644 (file)
--- a/onelab-tags.mk
+++ b/onelab-tags.mk
@@ -45,7 +45,7 @@ BootCD-SVNPATH                        := http://svn.planet-lab.org/svn/BootCD/tags/BootCD-4.2-14
 VserverReference-SVNPATH       := http://svn.planet-lab.org/svn/VserverReference/tags/VserverReference-4.2-12
 BootstrapFS-SVNPATH            := http://svn.planet-lab.org/svn/BootstrapFS/tags/BootstrapFS-1.0-8
 MyPLC-SVNPATH                  := http://svn.planet-lab.org/svn/MyPLC/trunk
-sfa-SVNPATH                     := http://svn.planet-lab.org/svn/geniwrapper/tags/geniwrapper-0.8-6
+sfa-SVNPATH                     := http://svn.planet-lab.org/svn/sfa/tags/sfa-0.9-0
 pyopenssl-SVNPATH               := http://svn.planet-lab.org/svn/pyopenssl/tags/pyopenssl-0.9-1
 PLCRT-SVNPATH                  := http://svn.planet-lab.org/svn/PLCRT/tags/PLCRT-1.0-5
 

diff --git a/onelab.mk b/onelab.mk
index 35222ad..9b6deec 100644 (file)
--- a/onelab.mk
+++ b/onelab.mk
@@ -340,7 +340,7 @@ ALL += pyopenssl
 
 
 #
-# sfa - Slice Facility Architecture - fka geniwrapper
+# sfa - Slice Facility Architecture
 #
 sfa-MODULES := sfa
 sfa-SPEC := sfa.spec

diff --git a/planetbridge-tags.mk b/planetbridge-tags.mk
index 83afa6a..906da72 100644 (file)
--- a/planetbridge-tags.mk
+++ b/planetbridge-tags.mk
@@ -39,7 +39,7 @@ BootCD-SVNPATH                        := http://svn.planet-lab.org/svn/BootCD/tags/BootCD-4.2-14
 VserverReference-SVNPATH       := http://svn.planet-lab.org/svn/VserverReference/tags/VserverReference-4.2-12
 BootstrapFS-SVNPATH            := http://svn.planet-lab.org/svn/BootstrapFS/tags/BootstrapFS-1.0-8
 MyPLC-SVNPATH                  := http://svn.planet-lab.org/svn/MyPLC/tags/MyPLC-4.3-21
-sfa-SVNPATH                     := http://svn.planet-lab.org/svn/geniwrapper/tags/geniwrapper-0.8-6
+sfa-SVNPATH                     := http://svn.planet-lab.org/svn/sfa/tags/sfa-0.9-0
 pyopenssl-SVNPATH               := http://svn.planet-lab.org/svn/pyopenssl/tags/pyopenssl-0.9-1
 PLCRT-SVNPATH                  := http://svn.planet-lab.org/svn/PLCRT/tags/PLCRT-1.0-5
 

diff --git a/planetbridge.mk b/planetbridge.mk
index 3b03327..51ceffa 100644 (file)
--- a/planetbridge.mk
+++ b/planetbridge.mk
@@ -277,7 +277,7 @@ ALL += pyopenssl
 
 
 #
-# sfa - Slice Facility Architecture - fka geniwrapper
+# sfa - Slice Facility Architecture
 #
 sfa-MODULES := sfa
 sfa-SPEC := sfa.spec

diff --git a/planetlab-k27-tags.mk b/planetlab-k27-tags.mk
index e848167..2da9ea4 100644 (file)
--- a/planetlab-k27-tags.mk
+++ b/planetlab-k27-tags.mk
@@ -37,7 +37,7 @@ BootCD-SVNPATH                        := http://svn.planet-lab.org/svn/BootCD/tags/BootCD-4.2-14
 VserverReference-SVNPATH       := http://svn.planet-lab.org/svn/VserverReference/tags/VserverReference-4.2-12
 BootstrapFS-SVNPATH            := http://svn.planet-lab.org/svn/BootstrapFS/tags/BootstrapFS-1.0-8
 MyPLC-SVNPATH                  := http://svn.planet-lab.org/svn/MyPLC/tags/MyPLC-4.3-21
-sfa-SVNPATH                     := http://svn.planet-lab.org/svn/geniwrapper/trunk
+sfa-SVNPATH                     := http://svn.planet-lab.org/svn/sfa/trunk
 pyopenssl-SVNPATH               := http://svn.planet-lab.org/svn/pyopenssl/tags/pyopenssl-0.9-1
 PLCRT-SVNPATH                   := http://svn.planet-lab.org/svn/PLCRT/tags/PLCRT-1.0-5
 

diff --git a/planetlab-tags.mk b/planetlab-tags.mk
index 83afa6a..906da72 100644 (file)
--- a/planetlab-tags.mk
+++ b/planetlab-tags.mk
@@ -39,7 +39,7 @@ BootCD-SVNPATH                        := http://svn.planet-lab.org/svn/BootCD/tags/BootCD-4.2-14
 VserverReference-SVNPATH       := http://svn.planet-lab.org/svn/VserverReference/tags/VserverReference-4.2-12
 BootstrapFS-SVNPATH            := http://svn.planet-lab.org/svn/BootstrapFS/tags/BootstrapFS-1.0-8
 MyPLC-SVNPATH                  := http://svn.planet-lab.org/svn/MyPLC/tags/MyPLC-4.3-21
-sfa-SVNPATH                     := http://svn.planet-lab.org/svn/geniwrapper/tags/geniwrapper-0.8-6
+sfa-SVNPATH                     := http://svn.planet-lab.org/svn/sfa/tags/sfa-0.9-0
 pyopenssl-SVNPATH               := http://svn.planet-lab.org/svn/pyopenssl/tags/pyopenssl-0.9-1
 PLCRT-SVNPATH                  := http://svn.planet-lab.org/svn/PLCRT/tags/PLCRT-1.0-5
 

diff --git a/planetlab.mk b/planetlab.mk
index 3b03327..51ceffa 100644 (file)
--- a/planetlab.mk
+++ b/planetlab.mk
@@ -277,7 +277,7 @@ ALL += pyopenssl
 
 
 #
-# sfa - Slice Facility Architecture - fka geniwrapper
+# sfa - Slice Facility Architecture
 #
 sfa-MODULES := sfa
 sfa-SPEC := sfa.spec