isolate import tools in sfa/importer

diff --git a/Makefile b/Makefile
index 04ed4ba..4f1b51a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -125,7 +125,7 @@ sfiAddAttribute.py sfiAddSliver.py sfiDeleteAttribute.py sfiDeleteSliver.py sfiL
 sfiListSlivers.py sfadump.py
 
 BINS = ./config/sfa-config-tty ./config/gen-sfa-cm-config.py \
-       ./sfa/plc/sfa-import-plc.py ./sfa/plc/sfa-nuke-plc.py ./sfa/server/sfa-start.py \
+       ./sfa/importer/sfa-import-plc.py ./sfa/importer/sfa-nuke-plc.py ./sfa/server/sfa-start.py \
        $(foreach client,$(CLIENTS),./sfa/client/$(client))
 
 sync:

diff --git a/setup.py b/setup.py
index 61c087e..ffd8406 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -12,8 +12,8 @@ from distutils.core import setup
 bins = [ 
     'config/sfa-config-tty',
     'config/gen-sfa-cm-config.py',
-    'sfa/plc/sfa-import-plc.py', 
-    'sfa/plc/sfa-nuke-plc.py', 
+    'sfa/importer/sfa-import-plc.py', 
+    'sfa/importer/sfa-nuke-plc.py', 
     'sfa/server/sfa-ca.py', 
     'sfa/server/sfa-start.py', 
     'sfa/server/sfa-clean-peer-records.py', 
@@ -44,6 +44,7 @@ package_dirs = [
     'sfa/generic',
     'sfa/managers',
     'sfa/managers/vini',
+    'sfa/importer',
     'sfa/plc',
     'sfa/rspecs',
     'sfa/rspecs/elements',

diff --git a/sfa/importer/__init__.py b/sfa/importer/__init__.py
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/sfa/plc/sfa-import-plc.py b/sfa/importer/sfa-import-plc.py
similarity index 99%
rename from sfa/plc/sfa-import-plc.py
rename to sfa/importer/sfa-import-plc.py
index d57b4b8..6873f48 100755 (executable)
--- a/sfa/plc/sfa-import-plc.py
+++ b/sfa/importer/sfa-import-plc.py
@@ -24,7 +24,7 @@ from sfa.util.plxrn import hostname_to_hrn, slicename_to_hrn, email_to_hrn, hrn_
 from sfa.util.config import Config
 from sfa.util.xrn import Xrn
 
-from sfa.plc.sfaImport import sfaImport
+from sfa.importer.sfaImport import sfaImport
 
 def process_options():
 

diff --git a/sfa/plc/sfa-nuke-plc.py b/sfa/importer/sfa-nuke-plc.py
similarity index 100%
rename from sfa/plc/sfa-nuke-plc.py
rename to sfa/importer/sfa-nuke-plc.py

diff --git a/sfa/plc/sfaImport.py b/sfa/importer/sfaImport.py
similarity index 100%
rename from sfa/plc/sfaImport.py
rename to sfa/importer/sfaImport.py