From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Fri, 3 Jul 2009 15:29:46 +0000 (+0000)
Subject: ongoing
X-Git-Tag: sfa-0.9-0@14641~172
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=ae17f5340af09279591c75fcd1cff5e6d093bdd9;p=sfa.git

ongoing
---

diff --git a/component/component.py b/component/component.py
index fc8283e3..828c3d30 100644
--- a/component/component.py
+++ b/component/component.py
@@ -1,7 +1,7 @@
 ##
-# Geni Component Wrapper
+# Sfa Component Wrapper
 #
-# This wrapper implements the Geni Slice and Mgmt Interfaces on a node.
+# This wrapper implements the SFA Slice and Mgmt Interfaces on a node.
 #
 ##
 
diff --git a/config/sfa-config-tty b/config/sfa-config-tty
index 2031acd4..e50be263 100755
--- a/config/sfa-config-tty
+++ b/config/sfa-config-tty
@@ -266,7 +266,7 @@ def setup_server_key(config_dict):
         print "\t\t%(old_server_key)s\ncopied from\t%(new_server_key)s" % locals()
     # this is expected when running this tool for the first time (before sfa-import-plc.py)
     except:
-        print "Could not create %(old_server_key)s - ignore if you haven't run gimport yet"%locals()
+        print "Could not create %(old_server_key)s - ignore if you haven't run sfa-import-plc.py yet"%locals()
     
     
 
diff --git a/config/sfa_config b/config/sfa_config
index 10d617b4..c72e80ed 100644
--- a/config/sfa_config
+++ b/config/sfa_config
@@ -1,5 +1,5 @@
-# Directory where Geni intefaces are installed
-GENI_BASE_DIR="/usr/share/geniwrapper/" 
+# Directory where SFA interfaces are installed
+GENI_BASE_DIR="/usr/share/sfa/" 
 
 # HRN
 # Human readable name for the interfaces
diff --git a/sfa/init.d/sfa b/sfa/init.d/sfa
index da583a8a..bbfa3961 100755
--- a/sfa/init.d/sfa
+++ b/sfa/init.d/sfa
@@ -1,10 +1,10 @@
 #!/bin/bash
 #
-# geniwrapper   Wraps PLCAPI into the GENI compliant API
+# sfa   Wraps PLCAPI into the SFA compliant API
 #
 # chkconfig: 2345 5 99
 #
-# description:   Wraps PLCAPI into the GENI compliant API
+# description:   Wraps PLCAPI into the SFA compliant API
 #
 # $Id$
 # $URL$
@@ -18,7 +18,7 @@
 
 
 start() {
-        echo -n $"Starting GENIWrapper:  "
+        echo -n $"Starting SFA:  "
 
         if [ "$GENI_REGISTRY_ENABLED" ]; then
             echo "Registry"
@@ -37,17 +37,17 @@ start() {
 
         RETVAL=$?
         echo
-        [ $RETVAL -eq 0 ] && touch /var/lock/subsys/geniwrapper
+        [ $RETVAL -eq 0 ] && touch /var/lock/subsys/sfa
 
 }
 
 stop() {
-    echo -n $"Shutting down GENIWrapper: "
+    echo -n $"Shutting down SFA: "
     killproc sfa-server.py
     RETVAL=$?
 
     echo
-    [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/geniwrapper
+    [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/sfa
 }
 
 
@@ -64,13 +64,13 @@ case "$1" in
     start
     ;;
   condrestart)
-    if [ -f /var/lock/subsys/geniwrapper ]; then
+    if [ -f /var/lock/subsys/sfa ]; then
         stop
         start
     fi
     ;;
   status)
-    status geniwrapper
+    status sfa
     RETVAL=$?
     ;;
   *)